Merge pull request #2168 from maryamtahhan/feat_libvirt_upstream