Merge branch 'fix/search-test-on-exit' into 'develop'