Merge branch 'openapi-improvements' into 'develop'