[ros-diffs] [hbirr] 18541: Merging over the usb changes didn't work. I must delete and copy the changes manually.