Merge branch '2614_word_completion'