Resolve JS-96 "7.0 "

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

Closes JS-96

Merge request reports