Merge pull request #9342 from annando/fatal