Js216

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

Merge request reports