Merge branch 'x86/uv'