Merge branch 'prerelease'