Merge "Adding enumerations in API schema"