Merge branch 'x86' into next