Merge branch '3449_search_segfault'