Merge "Merge commit '0bb03714' into msm-4.9 - PC 141"