Merge pull request #19613 from eileenmcnaughton/catch