[FIX] Problem with units as uom

Merged Santiago Said requested to merge FixProblemUnits into 8.0

Merge request reports