Merge "UpdateSwagger annotations and OpenAPI.yaml"