Merge "A few fixes for RotationResolver" into sc-dev