[IMP] Fix

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

Merge request reports