diff --git a/source/CMAgentSsp/ssp_main.c b/source/CMAgentSsp/ssp_main.c
index d9c9ed6..118e583 100644
--- a/source/CMAgentSsp/ssp_main.c
+++ b/source/CMAgentSsp/ssp_main.c
@@ -51,6 +51,7 @@
 //#include <docsis_ext_interface.h>
 #include "safec_lib_common.h"
 #include "syscfg/syscfg.h"
+#include "telemetry_busmessage_sender.h"
 #include <sys/stat.h>
 
 #define DEBUG_INI_NAME "/etc/debug.ini"
@@ -960,6 +961,7 @@ int main(int argc, char *argv[])
     CcspTraceInfo(("pthread create docsis registration\n"));
     pthread_create(&docsisclbk_tid, NULL, GWP_docsisregistration_threadfunc, NULL);
 #endif
+	t2_init("CcspCMAgent");
     cmd_dispatch('e');
     // printf("Calling Docsis\n");
 
diff --git a/source/TR-181/integration_src.shared/Makefile.am b/source/TR-181/integration_src.shared/Makefile.am
index 944ab48..acd49bb 100644
--- a/source/TR-181/integration_src.shared/Makefile.am
+++ b/source/TR-181/integration_src.shared/Makefile.am
@@ -29,7 +29,7 @@ libCcspCMAgent_integration_src_shared_la_CPPFLAGS = \
     -I$(top_srcdir)/source/Custom
 
 libCcspCMAgent_integration_src_shared_la_SOURCES = cosa_x_cisco_com_cablemodem_apis.c cosa_device_info_apis.c cosa_x_rdkcentral_com_cablemodem_apis.c
-libCcspCMAgent_integration_src_shared_la_LDFLAGS = -lccsp_common -lcm_mgnt -lsysevent -lsecure_wrapper
+libCcspCMAgent_integration_src_shared_la_LDFLAGS = -lccsp_common -lcm_mgnt -lsysevent -lsecure_wrapper -lfw_download_chk
 if CORE_NET_LIB_FEATURE_SUPPORT
 libCcspCMAgent_integration_src_shared_la_LDFLAGS += -lnet
 endif
diff --git a/source/TR-181/integration_src.shared/cosa_device_info_apis.c b/source/TR-181/integration_src.shared/cosa_device_info_apis.c
index a32336a..bf65b80 100644
--- a/source/TR-181/integration_src.shared/cosa_device_info_apis.c
+++ b/source/TR-181/integration_src.shared/cosa_device_info_apis.c
@@ -77,6 +77,7 @@
 #include "safec_lib_common.h"
 #include <syscfg/syscfg.h>
 #include "secure_wrapper.h"
+#include "fw_download_check.h"
 
 #define CM_HTTPURL_LEN 512
 #define VALID_fW_LEN 128
@@ -379,7 +380,6 @@ ANSC_STATUS CosaDmlDIGetRfSignalStatus(BOOLEAN *pRfSignalStatus) {
 }
 #endif
 
-
 ANSC_STATUS CosaDmlDIDownloadNow(ANSC_HANDLE hContext)
 {
 	PCOSA_DATAMODEL_DEVICEINFO     pMyObject = (PCOSA_DATAMODEL_DEVICEINFO)hContext;
@@ -491,6 +491,12 @@ ANSC_STATUS CosaDmlDIDownloadNow(ANSC_HANDLE hContext)
 		}	
 
 	}   */
+    
+    if(can_proceed_fw_download() == FW_DWNLD_MEMCHK_NOT_ENOUGH_MEM){
+        CcspTraceError(("CosaDmlDIDownloadNow : Not enough memory to proceed firmware download\n"));
+        return ANSC_STATUS_FAILURE;
+    }
+
 	pthread_t FWDL_Thread;
 	res = pthread_create(&FWDL_Thread, NULL, FWDL_ThreadFunc, "FWDL_ThreadFunc"); 
 	if(res != 0)