Final changes to include in alpha6.