Merge branch 'alpha' (alpha architecture patches)