Move these two up to changes for the b20 release.