uv

Avoid forking on version in non-universal resolutions

#10274

Merged