Merge branch '1917_viewer_search_again'