Merge "Bring Telecom logic into agreement with Bluetooth" into pi-dev