am 735dc87c: Merge "Fix JIT options with late init"

* commit '735dc87c92bee338d0638b3290c2b93a122429f2':
  Fix JIT options with late init