Merge pull request #7454 from sieben/duplicate_keys