msm_rotator:Backport from 4.1.H.0.4 sources