Merge branch 'alpha0.5' into alpha-fix