Merge branch 'openapi/instance' into 'develop'