Merge "Unhardcode encrypted volume types names" into mcp/caracal