Merge branch 'whole-word-filter-hotfix' into 'develop'