Js217

Merged Jose Luis Zanotti requested to merge JS217 into 7.0-stage

Merge request reports