Merge "Set volume_device_name variable"