Merge branches 'msm/fixes-non-critical' and 'msm/cleanup' into next/dt