Merge branch 'search-feature'