Merge branch 'x86/bugs' into x86/core, to pick up pending changes before dependent...