Release and merge conflict resolution

merging in the release branch, plus resolving merge conflicts