Fix build.
Merge branch 'dev' into feature/usb