Merge "[DO NOT MERGE] Remove one search flag and code from sc-v2." into sc-v2-dev