Merge branch 'msm-core' into for-next