[IMP] Bugfix

Merged Jose Luis Zanotti requested to merge JS237-Fix_bug into 7.0

Merge request reports