Merge pull request #17539 from eileenmcnaughton/fatal2