Merge in conflicted files bringing Release branch up-to-date