Remove 'batch_search'. See #12347
Merge pull request #2707 from sbesson/rebased/dev_5_0/batch_search_12347

Remove 'batch_search'. See #12347 (rebased onto dev_5_0)