Added protection against duplicated keys in key-value-mapping
Key-value mapping tweak
Merge pull request #3686 from lwyszomi/80598-case

Added protection against duplicated keys in key-value-mapping