Added backport for updated Wi-Fi and Bluetooth