[MOD] modifications

Merged Felipe Carlini requested to merge 11.0-subtract_units into 11.0-stage

Merge request reports