12.0 update uo

Merged Santiago Said requested to merge 12.0-update-uo into 12.0-stage

Merge request reports