Merge pull request #11719 from eileenmcnaughton/fatal