diff --git a/openair2/COMMON/m2ap_messages_def.h b/openair2/COMMON/m2ap_messages_def.h
index f4273573cd..adad70c9cc 100644
--- a/openair2/COMMON/m2ap_messages_def.h
+++ b/openair2/COMMON/m2ap_messages_def.h
@@ -19,6 +19,7 @@
  *      contact@openairinterface.org
  */
 
+
 /* eNB application layer -> M2AP messages */
 /* ITTI LOG messages */
 /* ENCODER */
diff --git a/openair2/COMMON/m2ap_messages_types.h b/openair2/COMMON/m2ap_messages_types.h
index f2ee1de43e..501414f296 100644
--- a/openair2/COMMON/m2ap_messages_types.h
+++ b/openair2/COMMON/m2ap_messages_types.h
@@ -19,6 +19,7 @@
  *      contact@openairinterface.org
  */
 
+
 #ifndef M2AP_MESSAGES_TYPES_H_
 #define M2AP_MESSAGES_TYPES_H_
 
diff --git a/openair2/COMMON/messages_def.h b/openair2/COMMON/messages_def.h
index b0219db50a..0d302cfea0 100644
--- a/openair2/COMMON/messages_def.h
+++ b/openair2/COMMON/messages_def.h
@@ -36,6 +36,8 @@
 #include "s1ap_messages_def.h"
 #include "f1ap_messages_def.h"
 #include "x2ap_messages_def.h"
+#include "m2ap_messages_def.h"
+#include "m3ap_messages_def.h"
 #include "sctp_messages_def.h"
 #include "udp_messages_def.h"
 #include "gtpv1_u_messages_def.h"
diff --git a/openair2/COMMON/platform_constants.h b/openair2/COMMON/platform_constants.h
index 2b28b760a8..f978258f88 100644
--- a/openair2/COMMON/platform_constants.h
+++ b/openair2/COMMON/platform_constants.h
@@ -109,7 +109,8 @@
 #define NB_RAB_MAX     LTE_maxDRB       /* was 8, now 11 */
 #define RAB_SHIFT1     9
 #define RAB_SHIFT2     3
-#define RAB_OFFSET     0x0007
+//#define RAB_OFFSET     0x0007
+#define RAB_OFFSET     0x000F
 #define RAB_OFFSET1    0x7E00
 #define RAB_OFFSET2    0x01F8
 #define DIR_OFFSET     0x8000
diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
index 4b8f6077fe..cfb684d53d 100644
--- a/openair2/COMMON/rrc_messages_types.h
+++ b/openair2/COMMON/rrc_messages_types.h
@@ -200,6 +200,7 @@ typedef struct RrcConfigurationReq_s {
   int16_t                 N_RB_DL[MAX_NUM_CCs];// for testing, change later
   int                     nb_antenna_ports[MAX_NUM_CCs];
   int                     eMBMS_configured;
+  int                     eMBMS_M2_configured;
   int                     eMTC_configured;
   int                     SL_configured;
 
diff --git a/openair2/COMMON/tasks_def.h b/openair2/COMMON/tasks_def.h
index 2ccb7b1c29..f4656573ed 100644
--- a/openair2/COMMON/tasks_def.h
+++ b/openair2/COMMON/tasks_def.h
@@ -48,6 +48,15 @@ TASK_DEF(TASK_GTPV1_U,  TASK_PRIORITY_MED,          1000)
 TASK_DEF(TASK_S1AP,     TASK_PRIORITY_MED,          200)
 TASK_DEF(TASK_CU_F1,     TASK_PRIORITY_MED,          200)
 TASK_DEF(TASK_DU_F1,     TASK_PRIORITY_MED,          200)
+///   M3ap task, acts as both source and target
+TASK_DEF(TASK_M3AP,     TASK_PRIORITY_MED,          200)
+///   M3ap task, acts as both source and target
+TASK_DEF(TASK_M3AP_MME,     TASK_PRIORITY_MED,          200)
+///   M3ap task, acts as both source and target
+TASK_DEF(TASK_M3AP_MCE,     TASK_PRIORITY_MED,          200)
+///   M2ap task, acts as both source and target
+TASK_DEF(TASK_M2AP_MCE,     TASK_PRIORITY_MED,          200)
+TASK_DEF(TASK_M2AP_ENB,     TASK_PRIORITY_MED,          200)
 ///   X2ap task, acts as both source and target
 TASK_DEF(TASK_X2AP,     TASK_PRIORITY_MED,          200)
 ///   Sctp task (Used by both S1AP and X2AP)