[MOD] Fix Bug

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

Merge request reports