Uiop upgrade

Small fixes and tweaks to better deal with cases of UIOP upgrade vs non-upgrade

Merge request reports

Loading