Merge remote branch 'spice/usb.5' into staging