Merge branch 'ar/dup-words-fixes'