Merge "Fixing issues in OpenAPI document"