Merge branch 'alpha' into old_master