Merge "Remove ENABLE_ONE_SEARCH" into tm-dev