uplink branch merged / CONFIG_TX_ENABLE