Merge "Fix conditional jump over jmp (X86/X86-64/ARM32)"