[FIX]Split UO

Merged Gastón Bertolani requested to merge 12.0-fix-uo into 12.0-stage

Merge request reports