UnitControl
: tidy up utils and types
#38987
Merged
UnitControl
: tidy up utils and types
#38987