Merge branch 'develop_SA_SIM' into develop_SA_L3

Conflicts:
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair2/RRC/NR_UE/rrc_defs.h
	openair3/NGAP/ngap_gNB_nas_procedures.c

openair3/NAS/NR_UE/nr_nas_msg_sim.c

@@ -525,6 +525,8 @@ void generateSecurityModeComplete(as_nas_info_t *initialNasMsg)
 }
 
 void generateRegistrationComplete(as_nas_info_t *initialNasMsg, SORTransparentContainer               *sortransparentcontainer) {
+  //wait send RRCReconfigurationComplete and InitialContextSetupResponse
+  sleep(1);
   int length = 0;
   int size = 0;
   fgs_nas_message_t nas_msg;
@@ -603,6 +605,8 @@ void generateRegistrationComplete(as_nas_info_t *initialNasMsg, SORTransparentCo
 }
 
 void generatePduSessionEstablishRequest(as_nas_info_t *initialNasMsg){
+  //wait send RegistrationComplete
+  usleep(100*150);
   int size = 0;
   fgs_nas_message_t nas_msg;
   memset(&nas_msg, 0, sizeof(fgs_nas_message_t));