Merge branch 'x2apic' into release