Merge pull request #17536 from eileenmcnaughton/fatal3