Merge "Do not use self.volume_origin in volume.base.attach_volume"