Merge changes from the private branch to release branch