Merge "Make libvirt safe again"