Merge "Merge commit '8df48570' into msm-4.9 - PC 226"