Merge "Introduces RotationResolverService to the system"