Resolve JS-95 "7.0 "

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

Closes JS-95

Merge request reports