Merge pull request #14855 from briansull/improved-jitdump