Merge branch 'alpha' into gen-docs2