diff --git a/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.cc b/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.cc
index 5406538f88d75de8e111883dcd77221b4e9d9379..e968244f9887d840fe69990a34030a318192401f 100644
--- a/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.cc
+++ b/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.cc
@@ -15,15 +15,20 @@ class TTCN_EncDec;
 int UpperTesterSremSsemCodec::encode (const Record_Type& msg, OCTETSTRING& data)
 {
   loggers::get_instance().log_msg(">>> UpperTesterSremSsemCodec::encode: ", (const Record_Type&)msg);
+  loggers::get_instance().log(">>> UpperTesterSremSsemCodec::encode: %s", msg.get_descriptor()->name);
   
   TTCN_EncDec::clear_error();
   TTCN_Buffer encoding_buffer;
-  if (std::string(msg.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSremSsemInitialize") == 0) {
+  if (std::string(msg.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSremInitialize") == 0) {
     encoding_buffer.put_c(static_cast<const unsigned char>(UpperTesterSremSsemCodec::c_utSremSsemInitialize));
-  } else if (std::string(msg.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSremSsemTrigger") == 0) {
+  } else if (std::string(msg.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSsemInitialize") == 0) {
+      encoding_buffer.put_c(static_cast<const unsigned char>(UpperTesterSremSsemCodec::c_utSremSsemInitialize));
+  } else if (std::string(msg.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSremTrigger") == 0) {
     encoding_buffer.put_c(static_cast<const unsigned char>(UpperTesterSremSsemCodec::c_utSremSsemTrigger));
+  } else if (std::string(msg.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSremUpdate") == 0) {
+    encoding_buffer.put_c(static_cast<const unsigned char>(UpperTesterSremSsemCodec::c_utSremSsemUpdate));
   } else { // Error
-    data = OCTETSTRING();
+    data = OCTETSTRING(0, nullptr);
     loggers::get_instance().log("<<< UpperTesterSremSsemCodec::encode: Return -1");
     return -1;
   }
diff --git a/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.cc
index 73893fe2163676a0d329ba4034f06d8a4e89848b..806d3a395f00b2b093a520ad4e97b2ce39baa383 100644
--- a/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.cc
+++ b/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.cc
@@ -57,7 +57,7 @@ int uppertester_ivim_codec::encode (const Record_Type& msg, OCTETSTRING& data)
     // See ETSI TR 103 099 V1.4.1 Clause C.9.3	TerminateIvimEvent
     encoding_buffer.put_c(static_cast<const unsigned char>(uppertester_ivim_codec::c_utIvimTermination));
   } else { // Error
-    data = OCTETSTRING();
+    data = OCTETSTRING(0, nullptr);
     loggers::get_instance().log("<<< uppertester_ivim_codec::encode: Return -1");
     return -1;
   }
diff --git a/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.cc
index 5027065c66f632d34b09b40ddcbea5db05cd39d1..7d0b5f41af3b3c10cdc2720fe907c6a43e04233c 100644
--- a/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.cc
+++ b/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.cc
@@ -23,7 +23,7 @@ int uppertester_mapem_spatem_codec::encode (const Record_Type& msg, OCTETSTRING&
   } else if (std::string(msg.get_descriptor()->name).compare("@LibItsMapemSpatem_TypesAndValues.UtMapemSpatemTrigger") == 0) {
     encoding_buffer.put_c(static_cast<const unsigned char>(uppertester_mapem_spatem_codec::c_utMapemSpatemTrigger));
   } else { // Error
-    data = OCTETSTRING();
+    data = OCTETSTRING(0, nullptr);
     loggers::get_instance().log("<<< uppertester_mapem_spatem_codec::encode: Return -1");
     return -1;
   }
diff --git a/etc/AtsIVIM/AtsIVIM.cfg b/etc/AtsIVIM/AtsIVIM.cfg
index 258a3038feaca6f315ef8a278f1c244b07ffa720..60371a714dac2d3509b228f6b88df780c837d772 100644
--- a/etc/AtsIVIM/AtsIVIM.cfg
+++ b/etc/AtsIVIM/AtsIVIM.cfg
@@ -90,10 +90,10 @@ LogEventTypes:= Yes
 #     time_offset : Time offset, used to skip packets with time offset < time_offset
 #     save_mode   : 1 to save sent packet, 0 otherwise
 
-system.ivimPort.params := "IVIM/BTP(type=btpB,dst_port=2001,src_port=0)/GN(ll_address=0800275c4959,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,expiry=1000,beaconing=0,its_aid=141)/ETH(mac_src=0800275c4959,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and ether proto 0x8947)"
+system.ivimPort.params := "IVIM/BTP(type=btpB,dst_port=2001,src_port=0)/GN(ll_address=0800275c4959,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,expiry=1000,beaconing=0,its_aid=141)/ETH(mac_src=0800275c4959,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4959,nic=eth2,filter=and ether proto 0x8947)"
 
 # IVIM UpperTester port based on UDP (ETSI Wlan)
-system.utPort.params := "UT_IVIM/UDP(dst_ip=192.168.0.102,dst_port=12345,src_ip=192.168.0.104,src_port=12345)/ETH(mac_src=0800275c4959,mac_dst=F8CAB8083918,eth_type=0800)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and udp port 12345)"
+system.utPort.params := "UT_IVIM/UDP(dst_ip=192.168.1.252)"
 
 [EXECUTE]
 #ItsIvim_TestCases.TC_IS_IVI_MSGF_BV_01
diff --git a/etc/AtsMapemSpatem/AtsMapemSpatem.cfg b/etc/AtsMapemSpatem/AtsMapemSpatem.cfg
index 6f213cf8708d41cdea6bd68f3640b18212880367..e029df2fbab682864e84186caf151c2c4c7a56e6 100644
--- a/etc/AtsMapemSpatem/AtsMapemSpatem.cfg
+++ b/etc/AtsMapemSpatem/AtsMapemSpatem.cfg
@@ -90,10 +90,10 @@ LogEventTypes:= Yes
 #     time_offset : Time offset, used to skip packets with time offset < time_offset
 #     save_mode   : 1 to save sent packet, 0 otherwise
 
-system.mapemSpatemPort.params := "MapemSpatem/BTP(type=btpB,dst_port=2001,src_port=0)/GN(ll_address=0800275c4959,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,expiry=1000,beaconing=0,its_aid=141)/ETH(mac_src=0800275c4959,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and ether proto 0x8947)"
+system.mapemSpatemPort.params := "MapemSpatem/BTP(type=btpB,dst_port=2001,src_port=0)/GN(ll_address=0800275c4959,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,expiry=1000,beaconing=0,its_aid=141)/ETH(mac_src=0800275c4959,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4959,nic=eth2,filter=and ether proto 0x8947)"
 
 # MapemSpatem UpperTester port based on UDP (ETSI Wlan)
-system.utPort.params := "UT_MAPEMSPATEM/UDP(dst_ip=192.168.0.102,dst_port=12345,src_ip=192.168.0.104,src_port=12345)/ETH(mac_src=0800275c4959,mac_dst=F8CAB8083918,eth_type=0800)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and udp port 12345)"
+system.utPort.params := "UT_MAPEMSPATEM/UDP(dst_ip=192.168.0.252)"
 
 [EXECUTE]
 ItsMapem_TestCases.TC_IS_RLT_MSGF_BV_01
diff --git a/etc/AtsSremSsem/AtsSremSsem.cfg b/etc/AtsSremSsem/AtsSremSsem.cfg
index 70f1043571d4cbd5b8eeb15c77a40a1aaaa6ced6..d8729bf74540415540b7a5e348f2ca80a17b658f 100644
--- a/etc/AtsSremSsem/AtsSremSsem.cfg
+++ b/etc/AtsSremSsem/AtsSremSsem.cfg
@@ -90,10 +90,10 @@ LogEventTypes:= Yes
 #     time_offset : Time offset, used to skip packets with time offset < time_offset
 #     save_mode   : 1 to save sent packet, 0 otherwise
 
-system.sremSsemPort.params := "SremSsem/BTP(type=btpB,dst_port=2001,src_port=0)/GN(ll_address=0800275c4959,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,expiry=1000,beaconing=0,its_aid=141)/ETH(mac_src=0800275c4959,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and ether proto 0x8947)"
+system.sremSsemPort.params := "SremSsem/BTP(type=btpB,dst_port=2001,src_port=0)/GN(ll_address=0800275c4959,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,expiry=1000,beaconing=0,its_aid=141)/ETH(mac_src=0800275c4959,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4959,nic=eth2,filter=and ether proto 0x8947)"
 
-# SremSsem UpperTester port based on UDP (ETSI Wlan)
-system.utPort.params := "UT_SREMSSEM/UDP(dst_ip=192.168.0.102,dst_port=12345,src_ip=192.168.0.104,src_port=12345)/ETH(mac_src=0800275c4959,mac_dst=F8CAB8083918,eth_type=0800)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and udp port 12345)"
+# SremSsem UpperTester port based on UDP
+system.utPort.params := "UT_SREMSSEM/UDP(dst_ip=192.168.1.252)"
 
 [EXECUTE]
 ItsSrem_TestCases.TC_IS_RLT_MSGF_BV_01
diff --git a/scripts/devenv.bash.ubuntu b/scripts/devenv.bash.ubuntu
index c3ef2ee30ece4972360708c35038d6f0e57671df..c6a9aaa760e99b77b8176a4b8867af032d8bf6a8 100755
--- a/scripts/devenv.bash.ubuntu
+++ b/scripts/devenv.bash.ubuntu
@@ -69,3 +69,7 @@ fi
 export BROWSER=netsurf
 
 export OPENSSL_DIR=/usr/local
+
+export LSAN_OPTIONS=verbosity=1:log_threads=1
+
+
diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn
index 76407310e1b90a0aa549c1518a4c8f6923057501..e65952a235fab740b25964366a3e96f26b757575 100644
--- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn
+++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn
@@ -1149,7 +1149,7 @@ module ItsRSUsSimulator_Functions {
           v_t.stop;
           
           log("f_trigger_enrolment_request_await_response: receive ", v_response);
-          if (f_verify_pki_response_message(v_private_key, v_aes_sym_key, v_authentication_vector, vc_eaWholeHash, v_response.response.body.binary_body.ieee1609dot2_data, false, v_etsi_ts_102941_data) == false) {
+          if (f_verify_pki_response_message(v_private_key, v_aes_sym_key, v_authentication_vector, vc_eaWholeHash, v_response.response.body.binary_body.ieee1609dot2_data, false, -, v_etsi_ts_102941_data) == false) {
             log("f_trigger_enrolment_request_await_response: Failed to verify PKI message ***");
           } else {
             log("f_trigger_enrolment_request_await_response: Receive ", v_etsi_ts_102941_data, " ***");