[FIX] Bugfix

Merged Jose Luis Zanotti requested to merge JS235 into 7.0

Merge request reports