Merge branch '3525_search_whole_word'