Backported lmk from msm 3.0.8