Merge changes  into msm-4.9