Merge "Merge commit '8f6e1ddf' into msm-4.9 - PC170"