Merge "Fix for the JIT blocking mode plus some code cleanup."