Merge "Merge commit 'a630ce57' into msm-4.9 - PC 127"