Merge branch 'tr/word-diff'