Merge branch 'fix/2302-report-duplicates' into 'develop'