[FIX] Bugfix

Merged Jose Luis Zanotti requested to merge BugFix into 7.0-stage

Merge request reports