Merged changes to volume operations from upstream.