Merge branch 'kvm-late-6.1' into HEAD