Merge branch 'x86/debug' into x86/cpu