Merge "Merge commit 'b9474406' into msm-4.9 - PC225"