PLF-4366: unified search: SearchContext improvement
PLF-4366: unified search: SearchContext improvement(cont)
Merge branch 'master' into feature/stabilization