Merge "Fix volume_create to use shared function with a cleanup"