Merge branch 'x86/core' into cpus4096