Merge code for new version.