Merge pull request #7656 from neheb/msm