[IMP] bugfix

Merged Jose Luis Zanotti requested to merge JS234v2 into 7.0

Merge request reports