Merge "Add VolumeClient for cleanup"