Merge "Switch back to StaticRotationList from DynamicRotationList"