Fix

Merged Jose Luis Zanotti requested to merge T7483 into 12.0

Merge request reports