Update from linux-vm