Merge "msm: SSR: Fix problems with concurrent SSRs" into msm-3.4