7.0 uom category

Merged Leandro Martinek requested to merge 7.0-uom_category into 7.0-stage

Merge request reports