[FIX] Bugfix"

Merged Jose Luis Zanotti requested to merge Bugfix-prod into 7.0

Merge request reports