Move types.Volumes optional fields under a new type Upstream-commit: 2e2f16a621 Component: cli
2e2f16a621