This topic branch will be included in both kvm/master and kvm/next (for 5.8) in order to simplify testing of kvm/next.
