Merge branch 'release-cleanup'