Resolve JS-6

Merged Jose Luis Zanotti requested to merge JS-6 into 7.0-TEMP-PROD

Closes JS-6

Merge request reports