[update] Merge from linux-vmdev.