merge msm changes and additions