Merge branch 'bugfix/status-search-fallback' into 'develop'