Merge branch 'prerelease-cleanups'