fix code overlap

Merged Daniel Duarte requested to merge fix-overlap into develop

Merge request reports