Merge branch 'WIP.x86/boot' into x86/boot, to pick up ready branch