Merge branch 'x86/core' into perfcounters/core