7.0 fix repeated lines

Merged Gastón Bertolani requested to merge 7.0-fix-repeated-lines into 7.0-stage

Merge request reports