Merge commit 'origin/x86/urgent' into x86/asm