Remerge mabdul's alpha changes

Had to revert and remerge because they were sent to the wrong branch.