Merge branch 'JS265' into '7.0'

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

JS265

See merge request !36 (merged)

Merge request reports