Js233

Merged Jose Luis Zanotti requested to merge JS233 into 7.0

Merge request reports