am 6166a824: Merge "Implement issue #17906468: Allow search request to fall...
am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev
* commit '6166a824':
Implement issue #17906468: Allow search request to fall back to global search