This is from our WIP2 Bluetooth branch which is about a year out of date.

I copied files to other location, then created this branch and used WinMerge to merge in all related changes,

Without hopefully undoing any of the other changes