8.0 fix duplicated key error

Merged Sebastian Kennedy requested to merge 8.0-fix_duplicated_key_error into 8.0-stage

Merge request reports