pull fixes from dev into main for btscon #335

Closed doomlab closed 1 month ago