Merge "Add volume type description support"