Merge remote branch 'origin/x86/apic' into x86/mrst