Merge branch 'tb/complete-word-diff-regex' into maint