Merge branch 'x86/unify-lib' into x86/core