Merge "Fix JIT for class unloading"