Merge branch '2499_mcedit_select_cur_word'