Merge branch '2694_tilde_find_file'