Merge "KVM scenario updates"