Merge "Call remote RotationResolverService from current user" into main