Merge branch 'kvm-tsx-ctrl' into HEAD