Merge "msm: SSR: Don't fail init on NULL restart orders" into msm-3.4