Merge branch 'x86/platform'