[FIX] double nd created

Merged Leandro Martinek requested to merge 7.0-nd_fix into 7.0-stage

Merge request reports