Merge branch 'rs/maint-grep-word-regexp-fix'