Merge pull request #16433 from eileenmcnaughton/fatal