Js bugfix

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

Merge request reports