more Searcher refactor
Merge remote-tracking branch 'upstream/version4' into version4