Resolve JS-49 "7.0 "

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

Closes JS-49

Merge request reports