Merge branch 'openapi/search' into 'develop'