Merge branch 'x86/cpu' into x86/core, to resolve conflicts