Merge branch 'feature/move-search-to-db' into 'develop'