Remove uuid duplicates

Merged EKbfh requested to merge fix-uuid-duplicates into master

Merge request reports