Merge pull request #6464 from russellhadley/HardenJitStartup