Merge "Fixes a typo in Rotation Resolver." into sc-dev