Merge "Fixing handling of perturbation mass changes." into release-4-6