[merge] karl/uwe_usb branch