Merge branch 'x86/uv' into x86/core