Merge "Handle volume API version enablement"