Final changes for the alpha-4 release

Once merged, this will be the alpha-4 release.