Merge branch 'fix-search-speed' into 'develop'