Merge pull request #4701 from kumpera/jit_improvements