modifications

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

Merge request reports