Merge pull request #23122 from eileenmcnaughton/rr