Merge "Add support for special char in volume metadata"