Merge "Merge remote-tracking branch 'origin/tmp-bc33b0c' into 4.8" into msm-4.8