Merge pull request #20632 from eileenmcnaughton/ret