Merge branch '1704_quick_search'