Merge branch 'x86imm' into next