Fix

Merged Jose Luis Zanotti requested to merge T6443 into 12.0

Merge request reports