uv

small refactoring in pursuit of fixing conflicting extras/groups

#9386

Merged