Js199

Merged Jose Luis Zanotti requested to merge JS199 into 7.0

Merge request reports