Merge "Re-enable KVM"