[MOD] Small changes

Merged Jose Luis Zanotti requested to merge DPI175 into 12.0-stage

Merge request reports