[MERGE] Merge SKH's branch to remove duplicates on name_search (case:5861) branch...