Merge branch 'x86/urgent' into x86/platform, to resolve conflict