Merge branch 'x86/core' into perf/core, to resolve conflicts and to pick up completed...