Merge remote-tracking branch 'msm/msm-fixes' into HEAD