Js189

Merged Jose Luis Zanotti requested to merge JS189 into 7.0

Merge request reports