Bugfix

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

Merge request reports