7.0 merge fix

Merged Jose Luis Zanotti requested to merge 7.0-MergeFix into 7.0

Merge request reports