Merge branch 'failing-search-fixes' into 'develop'