Merge branch 'kvm-on-hv-msrbm-fix' into HEAD