PLF-4366: unified search: SearchContext improvement
PLF-4366: unified search: SearchContext improvement(cont)
Merge branch 'master' into feature/stabilization
fix correct version to 4.0.0-SNAPSHOT