Merge branch 'core/header-fixes' into x86/headers