diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 2728cac9b1721298ccad67a1867709cfd71defde..82c4e1cbcd3327b43bb34bad9f52e03df33dfe16 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -69,6 +69,7 @@ UE_TIMING_TRACE="False"
 DISABLE_LOG_X="False"
 USRP_REC_PLAY="False"
 BUILD_ECLIPSE=0
+BUILD_CODEBLOCKS=0
 UE_NAS_USE_TUN="False"
 BASIC_SIMULATOR=0
 trap handle_ctrl_c INT
@@ -156,6 +157,8 @@ Options
    Disable all LOG_* macros
 --build-eclipse
    Build eclipse project files. Paths are auto corrected by fixprj.sh
+--build-codeblocks
+   Build CodeBlocks project files.
 --build-telnet
    Build telnet server, specify --telnetsrv on command line to start it (eNB only)
 --build-msc
@@ -354,6 +357,11 @@ function main() {
             CMAKE_CMD="$CMAKE_CMD"' -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=TRUE -G"Eclipse CDT4 - Unix Makefiles"'
             echo_info "Enabling build eclipse project support"
             shift 1;;
+       --build-codeblocks)
+            BUILD_CODEBLOCKS=1
+            CMAKE_CMD="$CMAKE_CMD"' -DCMAKE_CODEBLOCKS_GENERATE_SOURCE_PROJECT=TRUE -G"CodeBlocks - Unix Makefiles"'
+            echo_info "Enabling build CodeBlocks project support"
+            shift 1;;
        --build-telnetsrv)
             BUILD_TELNETSRV=1
             echo_info "Build embedded telnet server"
diff --git a/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c b/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
index 87abdfe19cb67567344ec6507b807290c8a2e33e..379ca5272e8285df883495d9a5476be527a7f4a7 100644
--- a/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
+++ b/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
@@ -337,6 +337,11 @@ int lte_sync_time(int **rxdata, ///rx data in time domain
                   int *eNB_id)
 {
 
+// [IRTMS debug]
+
+    static int num_calles=0;
+    printf("[IRTMS]lte_sync_time called %d times\n", num_calles);
+
 
 
   // perform a time domain correlation using the oversampled sync sequence
diff --git a/openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c b/openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c
index 230eeac726fb3039ca23bdc88ba3839be4e2c0c4..8cda32b1b5e588b37299974def5135957ae02ef5 100644
--- a/openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c
+++ b/openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c
@@ -171,6 +171,8 @@ int netlink_init(void)
 {
   int ret;
 
+  printf("[IRTMS] Opening socket...\n");
+
   nas_sock_fd = socket(PF_NETLINK, SOCK_RAW,GRAAL_NETLINK_ID);
 
   if (nas_sock_fd == -1) {
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
index 79bd48cd0c5dac9287810cdf377c8322aec000ca..1c651c22d50b6a8738331557ab28e182362acd46 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
@@ -105,6 +105,9 @@ eNBs =
       ue_TimersAndConstants_n310			      = 20;
       ue_TimersAndConstants_n311			      = 1;
       ue_TransmissionMode                                    = 1;
+      # IRT MS addition:
+      # mbms_dedicated_serving_cell			= "ENABLE"
+
       }
     );
 
diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c
index a3aa0036628cdda51be0b0014de6fa5aedee89fa..d3b6447ea1d4f4f39a5a480a5ae5e28c076dc395 100644
--- a/targets/RT/USER/lte-uesoftmodem.c
+++ b/targets/RT/USER/lte-uesoftmodem.c
@@ -693,11 +693,27 @@ int main( int argc, char **argv ) {
 #if defined (XFORMS)
   int ret;
 #endif
+
+  // [IRTMS] fix, see Merge branch 'issue-399-master-ue-hot-fix' into 'master'
+  configmodule_interface_t *config_mod;
+  // [IRTMS]  end fix
+
   start_background_system();
 
+  // [IRTMS] fix, see Merge branch 'issue-399-master-ue-hot-fix' into 'master'
+  /*
   if ( load_configmodule(argc,argv,CONFIG_ENABLECMDLINEONLY) == NULL) {
     exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
   }
+  */
+  config_mod = load_configmodule(argc, argv, CONFIG_ENABLECMDLINEONLY);
+
+  if (config_mod == NULL) {
+
+    exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
+  }
+  // [IRTMS] end fix
+
 
   mode = normal_txrx;
   memset(&openair0_cfg[0],0,sizeof(openair0_config_t)*MAX_CARDS);
@@ -715,6 +731,10 @@ int main( int argc, char **argv ) {
     abort();
   }
 
+  printf("\n[IRTMS] Hello from main\n");
+
+
+
   printf("NFAPI_MODE value: %d \n", nfapi_mode);
 
   // Checking option of nums_ue_thread.
@@ -811,8 +831,12 @@ int main( int argc, char **argv ) {
   } else init_openair0(frame_parms[0],(int)rx_gain[0][0]);
 
   if (simL1flag==1) {
+  // [IRTRMS] fix, see Merge branch 'issue-399-master-ue-hot-fix' into 'master'
+  /*
     AssertFatal(NULL!=load_configmodule(argc,argv,CONFIG_ENABLECMDLINEONLY),
                 "[SOFTMODEM] Error, configuration module init failed\n");
+  */
+  // [IRTMS] end fix
     RCConfig_sim();
   }