Merge remote-tracking branch 'kvm/queue' into HEAD