Merge branch 'can-peak_usb-cleanups-and-updates'