Merge remote branch 'origin/x86/cpu' into x86/amd-nb