Merge changes into prerelease