Merge branch '1396_with_search_engine'