Merge "Support only volume api_v3 is enabled"