Resolve JS-59 "7.0 "

Closed Ignacio Goitea requested to merge 7.0-JS-59 into 7.0-stage

Closes JS-59

Merge request reports