Fix

Merged Jose Luis Zanotti requested to merge Fix into 8.0

Merge request reports