I found the branch **nr_sdap** was merged into **develop**, but the code in openair2\RRC\NR\rrc_gNB.c(line 927): ``` // Reference TS23501 Table 5.7.4-1: Standardized 5QI to QoS characteristics mapping for (qos_flow_index = 0; qos_flow_index < ue_context_pP->ue_context.pduSession[i].param.nb_qos; qos_flow_index++) { switch (ue_context_pP->ue_context.pduSession[i].param.qos[qos_flow_index].fiveQI) { case 1: //100ms case 2: //150ms case 3: //50ms case 4: //300ms case 5: //100ms case 6: //300ms case 7: //100ms case 8: //300ms case 9: //300ms Video (Buffered Streaming)TCP-based (e.g., www, e-mail, chat, ftp, p2p file sharing, progressive video, etc.) // TODO break; default: LOG_E(NR_RRC,"not supported 5qi %lu\n", ue_context_pP->ue_context.pduSession[i].param.qos[qos_flow_index].fiveQI); ue_context_pP->ue_context.pduSession[i].status = PDU_SESSION_STATUS_FAILED; ue_context_pP->ue_context.pduSession[i].xid = xid; pdu_sessions_done++; free(DRB_config); continue; } } ``` This part is still TODO, I'm curious when this part of the code will be completed? Or can anyone give me some hints about how to complete it. Thanks a lot!