Merge 3.2.69 USB fixes