More Bluetooth work.
Merge Branch