Merge remote-tracking branch 'origin/x86/boot' into x86/mm2