Merge branch 'fix/search-space-error' into 'develop'