Resolve JS-6

Merged Ignacio Goitea requested to merge JS-6 into 7.0-stage

Closes JS-6

Merge request reports