Merge branch 'trunk' into improve-kubevirt-node-driver