Backport Msm_rotator from 3.0.8