Merge commit 'tip/x86/headers' into x86/untangle2