virt: Merge changes from master to resolve conflict