Merge "Fixing issues with replica exchange" into release-4-6