Merge branch 'fix-search' into 'develop'