Merge "Fix JIT options with late init"