Merge "Merge commit '8a550616' into msm-4.9 - PC 128"