Merge branch '2614_word_completion' into 4.7.5-stable