Merge "JIT default opt-in"