diff --git a/RIOT_LPA108661.tpd b/RIOT_LPA108661.tpd
index 6beeb51..915b6c8 100644
--- a/RIOT_LPA108661.tpd
+++ b/RIOT_LPA108661.tpd
@@ -16,60 +16,8 @@
 -->
   <ProjectName>RIOT_LPA108661</ProjectName>
   <ReferencedProjects>
-    <ReferencedProject name="EPTF_Applib_COAP_CNL113858" projectLocationURI="src/Libraries/EPTF_Applib_COAP_CNL113858/EPTF_Applib_COAP_CNL113858.tpd"/>
-    <ReferencedProject name="EPTF_Applib_LWM2M_CNL113859" projectLocationURI="src/Libraries/EPTF_Applib_LWM2M_CNL113859/EPTF_Applib_LWM2M_CNL113859.tpd"/>
-    <ReferencedProject name="EPTF_Applib_MBT_CNL113659" projectLocationURI="src/Libraries/EPTF_Applib_MBT_CNL113659/EPTF_Applib_MBT_CNL113659.tpd"/>
-    <ReferencedProject name="EPTF_Applib_MQTT_CNL113860" projectLocationURI="src/Libraries/EPTF_Applib_MQTT_CNL113860/EPTF_Applib_MQTT_CNL113860.tpd"/>
-    <ReferencedProject name="EPTF_Applib_HTTP_CNL113618" projectLocationURI="src/Libraries/EPTF_Applib_HTTP_CNL113618/EPTF_Applib_HTTP_CNL113618.tpd"/>
-    <ReferencedProject name="EPTF_CLL_Base" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/Base/EPTF_CLL_Base.tpd"/>
-    <ReferencedProject name="EPTF_CLL_Common" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/Common/EPTF_CLL_Common.tpd"/>
-    <ReferencedProject name="EPTF_CLL_DataSource" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/DataSource/EPTF_CLL_DataSource.tpd"/>
-    <ReferencedProject name="EPTF_CLL_DsRestAPI" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/DsRestAPI/EPTF_CLL_DsRestAPI.tpd"/>
-    <ReferencedProject name="EPTF_CLL_ExecCtrl" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/ExecCtrl/EPTF_CLL_ExecCtrl.tpd"/>
-    <ReferencedProject name="EPTF_CLL_FreeBusyQueue" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/FreeBusyQueue/EPTF_CLL_FBQ.tpd"/>
-    <ReferencedProject name="EPTF_CLL_HashMap" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/HashMap/EPTF_CLL_HashMap.tpd"/>
-    <ReferencedProject name="EPTF_CLL_ILogBase" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/ILog/EPTF_CLL_ILog.tpd"/>
-    <ReferencedProject name="EPTF_CLL_LGenBase" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/LGenBase/EPTF_CLL_LGenBase.tpd"/>
-    <ReferencedProject name="EPTF_CLL_Logging" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/Logging/EPTF_CLL_Logging.tpd"/>
-    <ReferencedProject name="EPTF_CLL_NQueue" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/NQueue/EPTF_CLL_NQueue.tpd"/>
-    <ReferencedProject name="EPTF_CLL_RandomNArray" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/RandomNArray/EPTF_CLL_RandomNArray.tpd"/>
-    <ReferencedProject name="EPTF_CLL_RedBlackTree" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/RedBlackTree/EPTF_CLL_RedBlackTree.tpd"/>
-    <ReferencedProject name="EPTF_CLL_RingBuffer" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/RingBuffer/EPTF_CLL_RingBuffer.tpd"/>
-    <ReferencedProject name="EPTF_CLL_Scheduler" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/Scheduler/EPTF_CLL_Scheduler.tpd"/>
-    <ReferencedProject name="EPTF_CLL_Semaphore" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/Semaphore/EPTF_CLL_Semaphore.tpd"/>
-    <ReferencedProject name="EPTF_CLL_StatHandler" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/StatHandler/EPTF_CLL_StatHandler.tpd"/>
-    <ReferencedProject name="EPTF_CLL_StatManager" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/StatManager/EPTF_CLL_StatManager.tpd"/>
-    <ReferencedProject name="EPTF_CLL_StatMeasure" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/StatMeasure/EPTF_CLL_StatMeasure.tpd"/>
-    <ReferencedProject name="EPTF_CLL_Transport_Common" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/Transport/EPTF_CLL_Transport_Common.tpd"/>
-    <ReferencedProject name="EPTF_CLL_Transport_CommPortIPL4" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/Transport/EPTF_CLL_Transport_CommPortIPL4.tpd"/>
-    <ReferencedProject name="EPTF_CLL_Transport_IPsecHandler" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/Transport/EPTF_CLL_Transport_IPsecHandler.tpd"/>
-    <ReferencedProject name="EPTF_CLL_Transport_MessageBufferManager" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/Transport/EPTF_CLL_Transport_MessageBufferManager.tpd"/>
-    <ReferencedProject name="EPTF_CLL_Variable" projectLocationURI="src/Libraries/EPTF_Core_Library_CNL113512/src/Variable/EPTF_CLL_Variable.tpd"/>
-    <ReferencedProject name="JSON_v07_2006_CNL113676_1" projectLocationURI="src/ProtocolModules/JSON_v07_2006_CNL113676/JSON_v07_2006_CNL113676_1.tpd"/>
-    <ReferencedProject name="ProtocolModules_Common" projectLocationURI="src/ProtocolModules/COMMON/ProtocolModules_Common.tpd"/>
-    <ReferencedProject name="TCCUsefulFunctions_CNL113472_Common" projectLocationURI="src/Libraries/TCCUsefulFunctions_CNL113472/TCCUsefulFunctions_CNL113472_Common.tpd"/>
+    <ReferencedProject name="IoT_Loadtest_Framework" projectLocationURI="src/Libraries/IoT_Loadtest_Framework/IoT_Loadtest_Framework.tpd"/>
   </ReferencedProjects>
-  <Files>
-    <FileResource projectRelativePath="IFW_CoAP_Peer_Definitions.ttcn" relativeURI="src/Libraries/IoT_Functiontest_Framework/IFW_CoAP_Peer_Definitions.ttcn"/>
-    <FileResource projectRelativePath="IFW_CoAP_Peer_Functions.ttcn" relativeURI="src/Libraries/IoT_Functiontest_Framework/IFW_CoAP_Peer_Functions.ttcn"/>
-    <FileResource projectRelativePath="IFW_CoAP_Peer_TestSteps.ttcn" relativeURI="src/Libraries/IoT_Functiontest_Framework/IFW_CoAP_Peer_TestSteps.ttcn"/>
-    <FileResource projectRelativePath="IFW_Common.ttcn" relativeURI="src/Libraries/IoT_Functiontest_Framework/IFW_Common.ttcn"/>
-    <FileResource projectRelativePath="IFW_HTTP_Client_Definitions.ttcn" relativeURI="src/Libraries/IoT_Functiontest_Framework/IFW_HTTP_Client_Definitions.ttcn"/>
-    <FileResource projectRelativePath="IFW_HTTP_Client_Functions.ttcn" relativeURI="src/Libraries/IoT_Functiontest_Framework/IFW_HTTP_Client_Functions.ttcn"/>
-    <FileResource projectRelativePath="IFW_HTTP_Client_TestSteps.ttcn" relativeURI="src/Libraries/IoT_Functiontest_Framework/IFW_HTTP_Client_TestSteps.ttcn"/>
-    <FileResource projectRelativePath="IFW_MQTT_Client_Definitions.ttcn" relativeURI="src/Libraries/IoT_Functiontest_Framework/IFW_MQTT_Client_Definitions.ttcn"/>
-    <FileResource projectRelativePath="IFW_MQTT_Client_Functions.ttcn" relativeURI="src/Libraries/IoT_Functiontest_Framework/IFW_MQTT_Client_Functions.ttcn"/>
-    <FileResource projectRelativePath="IFW_MQTT_Client_TestSteps.ttcn" relativeURI="src/Libraries/IoT_Functiontest_Framework/IFW_MQTT_Client_TestSteps.ttcn"/>
-    <FileResource projectRelativePath="IOT_App_Definitions.ttcn" relativeURI="src/Libraries/IoT_Loadtest_Framework/IOT_App_Definitions.ttcn"/>
-    <FileResource projectRelativePath="IOT_App_Functions.ttcn" relativeURI="src/Libraries/IoT_Loadtest_Framework/IOT_App_Functions.ttcn"/>
-    <FileResource projectRelativePath="IOT_LGen_Definitions.ttcn" relativeURI="src/Libraries/IoT_Loadtest_Framework/IOT_LGen_Definitions.ttcn"/>
-    <FileResource projectRelativePath="IOT_LGen_Functions.ttcn" relativeURI="src/Libraries/IoT_Loadtest_Framework/IOT_LGen_Functions.ttcn"/>
-    <FileResource projectRelativePath="IOT_LGen_Steps.ttcn" relativeURI="src/Libraries/IoT_Loadtest_Framework/IOT_LGen_Steps.ttcn"/>
-    <FileResource projectRelativePath="InfluxDB_Definitions.ttcn" relativeURI="src/Libraries/IoT_Loadtest_Framework/InfluxDB_Definitions.ttcn"/>
-    <FileResource projectRelativePath="InfluxDB_Functions.ttcn" relativeURI="src/Libraries/IoT_Loadtest_Framework/InfluxDB_Functions.ttcn"/>
-    <FileResource projectRelativePath="IoT_FT_Framework_Definitions.ttcn" relativeURI="src/Libraries/IoT_Functiontest_Framework/IoT_FT_Framework_Definitions.ttcn"/>
-    <FileResource projectRelativePath="IoT_FT_Framework_Functions.ttcn" relativeURI="src/Libraries/IoT_Functiontest_Framework/IoT_FT_Framework_Functions.ttcn"/>
-  </Files>
   <ActiveConfiguration>Default</ActiveConfiguration>
   <Configurations>
     <Configuration name="Default">
diff --git a/src/Libraries/EPTF_Applib_MQTT_CNL113860 b/src/Libraries/EPTF_Applib_MQTT_CNL113860
index e3a308b..20d5d36 160000
--- a/src/Libraries/EPTF_Applib_MQTT_CNL113860
+++ b/src/Libraries/EPTF_Applib_MQTT_CNL113860
@@ -1 +1 @@
-Subproject commit e3a308b81560ea7ddf6cb658b2eb5d962abdaae8
+Subproject commit 20d5d36d82d99f1a7a3b3dbbaac75a657201fa87
diff --git a/src/Libraries/IoT_Functiontest_Framework b/src/Libraries/IoT_Functiontest_Framework
index 4b7cbeb..4bb9051 160000
--- a/src/Libraries/IoT_Functiontest_Framework
+++ b/src/Libraries/IoT_Functiontest_Framework
@@ -1 +1 @@
-Subproject commit 4b7cbeb80b47d67c105db65eebd448fdea268e76
+Subproject commit 4bb90518b2fe3b818ae88a3eb93057360ed2d1b1
diff --git a/src/Libraries/IoT_Loadtest_Framework b/src/Libraries/IoT_Loadtest_Framework
index 2a467af..3375bf0 160000
--- a/src/Libraries/IoT_Loadtest_Framework
+++ b/src/Libraries/IoT_Loadtest_Framework
@@ -1 +1 @@
-Subproject commit 2a467afcef8376383b50a2efd4d294ffdaa6ccba
+Subproject commit 3375bf06f05fb1478201c5c1c4fe1b0f6b690c38
diff --git a/src/ProtocolModules/MQTT_v3.1.1_CNL113831 b/src/ProtocolModules/MQTT_v3.1.1_CNL113831
index 79bf722..c22560b 160000
--- a/src/ProtocolModules/MQTT_v3.1.1_CNL113831
+++ b/src/ProtocolModules/MQTT_v3.1.1_CNL113831
@@ -1 +1 @@
-Subproject commit 79bf722301ba5e2bb7da9a55de974c1beb1a8f5e
+Subproject commit c22560bb461c21cb1835f19721e990eb57691bad