Merge pull request #15871 from eileenmcnaughton/init_fatal