Merge "Correct volume type api schema validation"