Merge branch 'fix/misc' into topic/usb