Merge pull request #12188 from SamSaffron/master

Perf: avoid dupes add fallback logic for coders