Merge "Fixes broken tests of RotationResolverManager" into sc-dev