[3.7] Fix duplicating words words. (GH-6296) (GH-6297)

Most of them have been added in 3.7.
(cherry picked from commit bac2d5ba30339298db7d4caa9c8cd31d807cf081)
11 files changed