Merge "Fix deoptimization deadlock"