Merge branch 'kvm-hw-enable-refactor' into HEAD