new search branch
Merge remote-tracking branch 'origin/master' into feature/new-search-api