Merge "Improve check_vm_connectivity"