diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 69cdac028f..debf739669 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -2077,7 +2077,7 @@ add_executable(lte-softmodem
 
 target_link_libraries (lte-softmodem
   -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB PHY_COMMON PHY PHY_RU LFDS L2 
+  RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB PHY_COMMON PHY PHY_RU LFDS L2 
   ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
   NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
   -Wl,--end-group z dl)
diff --git a/openair2/RRC/LTE/MESSAGES/asn1c/ASN1_files/RRC-36331-f22.asn b/openair2/RRC/LTE/MESSAGES/asn1c/ASN1_files/RRC-36331-f22.asn
index 012cc6b270..47cbdd8198 100755
--- a/openair2/RRC/LTE/MESSAGES/asn1c/ASN1_files/RRC-36331-f22.asn
+++ b/openair2/RRC/LTE/MESSAGES/asn1c/ASN1_files/RRC-36331-f22.asn
@@ -7905,7 +7905,7 @@ MeasObjectNR-r15 ::=				SEQUENCE {
 	carrierFreq-r15						ARFCN-ValueNR-r15,
 	rs-ConfigSSB-r15					RS-ConfigSSB-NR-r15,
 	threshRS-Index-r15					ThresholdListNR-r15				OPTIONAL,		-- Need OR
-	maxRS-IndexCellQualNR-r15			INTEGER (1.. maxRS-IndexCellQual-r15)			OPTIONAL,		-- Need OR
+	maxRS-IndexCellQual-r15			INTEGER (1.. maxRS-IndexCellQualNR-r15)			OPTIONAL,		-- Need OR
 	offsetFreq-r15						Q-OffsetRangeInterRAT			DEFAULT 0,
 	blackCellsToRemoveList-r15			CellIndexList					OPTIONAL,		-- Need ON
 	blackCellsToAddModList-r15			CellsToAddModListNR-r15			OPTIONAL,		-- Need ON
@@ -11807,7 +11807,7 @@ maxReservationPeriod-r14	INTEGER ::= 16	-- Maximum number of resource reservatio
 maxRS-Index-r15				INTEGER ::= 64	-- Maximum number of RS indices
 maxRS-Index-1-r15				INTEGER ::= 63	-- Highest value of RS index as used to identify
 											-- RS index in RRM reports.
-maxRS-IndexCellQual-r15	INTEGER ::= 16	-- Maximum number of RS indices averaged to derive
+maxRS-IndexCellQualNR-r15	INTEGER ::= 16	-- Maximum number of RS indices averaged to derive
 											-- cell quality for RRM.
 maxRS-IndexReport-r15		INTEGER ::= 32	-- Maximum number of RS indices for RRM.
 maxRSTD-Freq-r10			INTEGER ::= 3	-- Maximum number of frequency layers for RSTD
diff --git a/openair2/RRC/NR/L2_nr_interface.c b/openair2/RRC/NR/L2_nr_interface.c
index c421118ebe..240f531a0e 100644
--- a/openair2/RRC/NR/L2_nr_interface.c
+++ b/openair2/RRC/NR/L2_nr_interface.c
@@ -29,8 +29,8 @@
  */
 
 #include "platform_types.h"
-#include "rrc_defs.h"
-#include "rrc_extern.h"
+#include "nr_rrc_defs.h"
+#include "nr_rrc_extern.h"
 #include "UTIL/LOG/log.h"
 #include "pdcp.h"
 #include "msc.h"
diff --git a/openair2/RRC/NR/nr_rrc_defs.h b/openair2/RRC/NR/nr_rrc_defs.h
index a9073e963e..d48a0e75f5 100644
--- a/openair2/RRC/NR/nr_rrc_defs.h
+++ b/openair2/RRC/NR/nr_rrc_defs.h
@@ -44,7 +44,7 @@
 //#include "LAYER2/RLC/rlc.h"
 
 //#include "COMMON/mac_rrc_primitives.h"
-#if defined(NR_Rel15)
+
 #include "NR_SIB1.h"
 //#include "SystemInformation.h"
 //#include "RRCConnectionReconfiguration.h"
@@ -65,7 +65,7 @@
 #include "NR_UE-NR-Capability.h"
 #include "NR_MeasResults.h"
 #include "NR_ServingCellConfigCommon.h"
-#endif
+
 //-------------------
 
 #if defined(ENABLE_ITTI)
diff --git a/openair2/RRC/NR/nr_rrc_proto.h b/openair2/RRC/NR/nr_rrc_proto.h
index d59e4c143d..5d67fc7f52 100644
--- a/openair2/RRC/NR/nr_rrc_proto.h
+++ b/openair2/RRC/NR/nr_rrc_proto.h
@@ -48,6 +48,15 @@ int8_t mac_rrc_nr_data_req(const module_id_t Mod_idP,
                            const uint8_t     Nb_tb,
                            uint8_t *const    buffer_pP );
 
+void rrc_gNB_process_SgNBAdditionRequest( 
+     const protocol_ctxt_t  *const ctxt_pP,
+     rrc_gNB_ue_context_t   *ue_context_pP 
+     );
+
+void rrc_gNB_generate_SgNBAdditionRequestAcknowledge( 
+     const protocol_ctxt_t  *const ctxt_pP,
+     rrc_gNB_ue_context_t   *const ue_context_pP
+     );
 
 #if defined(ENABLE_ITTI)
 /**\brief RRC eNB task.