Merge pull request #16155 from jashook/merge_jit_and_JIT