Merge pull request #23603 from eileenmcnaughton/rel2