Merge pull request #22394 from eileenmcnaughton/return