Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements

# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/main.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c

targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf

@@ -182,11 +182,11 @@ gNBs =
 );
 
 MACRLCs = (
-	{
-	num_cc = 1;
-	tr_s_preference = "local_L1";
-	tr_n_preference = "local_RRC";
-	}
+  {
+  num_cc = 1;
+  tr_s_preference = "local_L1";
+  tr_n_preference = "local_RRC";
+  }
 );
 
 L1s = (
@@ -194,6 +194,7 @@ L1s = (
   num_cc = 1;
   tr_n_preference = "local_mac";
   thread_pool_size = 8;
+  max_ldpc_iterations = 5;
   ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
 );