Merge "Do not umount /mnt/vm" into main