Merge pull request #16759 from eileenmcnaughton/fatal2