Merge branch 'x86/core' into x86/unify-cpu-detect