diff --git a/source/firewall/firewall.c b/source/firewall/firewall.c
index b0237dd7..d6301a5c 100644
--- a/source/firewall/firewall.c
+++ b/source/firewall/firewall.c
@@ -12546,6 +12546,16 @@ static int prepare_subtables(FILE *raw_fp, FILE *mangle_fp, FILE *nat_fp, FILE *
       updateAmenityNetworkRules(filter_fp,mangle_fp , AF_INET);
       #endif
    }
+   #if defined(SCXF10)
+   char cVoiceRule[64] = {0};
+   sysevent_get(sysevent_fd, sysevent_token, "VoiceIpRule", cVoiceRule, sizeof(cVoiceRule));
+   FIREWALL_DEBUG("%s: VoiceIpRule=%s\n" COMMA __FUNCTION__ COMMA cVoiceRule);
+   if (strlen(cVoiceRule) > 0)
+   {
+      fprintf(filter_fp,"%s\n", cVoiceRule);
+      FIREWALL_DEBUG("%s: Applied VoiceIpRule\n" COMMA __FUNCTION__);
+   }
+   #endif
    //Add wan2self restrictions to other wan interfaces
    //ping is allowed to cm and mta inferfaces regardless the firewall level
 #if !defined(_HUB4_PRODUCT_REQ_)
diff --git a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c
index 65596924..0ae27f24 100644
--- a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c
+++ b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c
@@ -1449,6 +1449,18 @@ STATIC void addInSysCfgdDB (char *key, char *value)
          set_syscfg_partner_values( value,"IPv6PrimaryDhcpServerOptions" );
       }
    }
+   if (0 == strcmp(key, "Device.X_RDKCENTRAL-COM_Epon_MTA.VoiceSupport.Enabled"))
+      if (0 == IsValuePresentinSyscfgDB("VoiceSupport_Enabled"))
+           set_syscfg_partner_values(value, "VoiceSupport_Enabled");
+
+   if (0 == strcmp(key, "Device.X_RDKCENTRAL-COM_Epon_MTA.VoiceSupport.InterfaceName"))
+      if (0 == IsValuePresentinSyscfgDB("VoiceSupport_IfaceName"))
+           set_syscfg_partner_values(value, "VoiceSupport_IfaceName");
+
+   if (0 == strcmp(key, "Device.X_RDKCENTRAL-COM_Epon_MTA.VoiceSupport.Mode"))
+      if (0 == IsValuePresentinSyscfgDB("VoiceSupport_Mode"))
+         set_syscfg_partner_values(value, "VoiceSupport_Mode");
+
 #endif
    if ( 0 == strcmp ( key, "Device.X_RDK_WebConfig.URL") )
    {
@@ -1714,6 +1726,14 @@ STATIC void updateSysCfgdDB (char *key, char *value)
    {
          set_syscfg_partner_values( value,"IPv4SecondaryDhcpServerOptions" );
    }
+   if (0 == strcmp(key, "Device.X_RDKCENTRAL-COM_Epon_MTA.VoiceSupport.Enabled"))
+      set_syscfg_partner_values(value, "VoiceSupport_Enabled");
+
+   if (0 == strcmp(key, "Device.X_RDKCENTRAL-COM_Epon_MTA.VoiceSupport.InterfaceName"))
+      set_syscfg_partner_values(value, "VoiceSupport_IfaceName");
+
+   if (0 == strcmp(key, "Device.X_RDKCENTRAL-COM_Epon_MTA.VoiceSupport.Mode"))
+      set_syscfg_partner_values(value, "VoiceSupport_Mode");
 #endif
    if ( 0 == strcmp ( key, "Device.X_RDK_WebConfig.URL") )
    {
@@ -3022,7 +3042,6 @@ static int apply_partnerId_default_values (char *data, char *PartnerID)
 				        {
 				            APPLY_PRINT("%s - Default Value of StartupIPMode is NULL\n", __FUNCTION__ );
 				        }
-
                paramObjVal = cJSON_GetObjectItem(cJSON_GetObjectItem( partnerObj, "Default_VoIP_Configuration_FileName"), "ActiveValue");
                if ( paramObjVal != NULL )
                {
@@ -3097,6 +3116,51 @@ if ( paramObjVal != NULL )
        {
             APPLY_PRINT("%s - Default Value of Secondary dhcp server option is NULL\n", __FUNCTION__ );
        }
+               paramObjVal = cJSON_GetObjectItem(cJSON_GetObjectItem(partnerObj,"Device.X_RDKCENTRAL-COM_Epon_MTA.VoiceSupport.Enabled"),"ActiveValue");
+               if(paramObjVal != NULL)
+               {
+                  char *pVoiceSupportEnabled = NULL;
+                  pVoiceSupportEnabled = paramObjVal->valuestring;
+                  if(pVoiceSupportEnabled != NULL)
+                  {
+                     set_syscfg_partner_values(pVoiceSupportEnabled,"VoiceSupport_Enabled");
+                     pVoiceSupportEnabled = NULL;
+                  }
+                  else
+                  {
+                     APPLY_PRINT("%s - VoiceSupportEnabled Value is NULL\n", __FUNCTION__ );
+                  }
+               }
+               paramObjVal = cJSON_GetObjectItem(cJSON_GetObjectItem(partnerObj,"Device.X_RDKCENTRAL-COM_Epon_MTA.VoiceSupport.InterfaceName"),"ActiveValue");
+               if(paramObjVal != NULL)
+               {
+                  char *pVoiceSupportIfaceName = NULL;
+                  pVoiceSupportIfaceName = paramObjVal->valuestring;
+                  if(pVoiceSupportIfaceName != NULL)
+                  {
+                     set_syscfg_partner_values(pVoiceSupportIfaceName,"VoiceSupport_IfaceName");
+                     pVoiceSupportIfaceName = NULL;
+                  }
+                  else
+                  {
+                     APPLY_PRINT("%s - VoiceSupportIfaceName Value is NULL\n", __FUNCTION__ );
+                  }
+               }
+               paramObjVal = cJSON_GetObjectItem(cJSON_GetObjectItem(partnerObj,"Device.X_RDKCENTRAL-COM_Epon_MTA.VoiceSupport.Mode"),"ActiveValue");
+               if(paramObjVal != NULL)
+               {
+                  char *pVoiceSupportMode = NULL;
+                  pVoiceSupportMode = paramObjVal->valuestring;
+                  if(pVoiceSupportMode != NULL)
+                  {
+                     set_syscfg_partner_values(pVoiceSupportMode,"VoiceSupport_Mode");
+                     pVoiceSupportMode = NULL;
+                  }
+                  else
+                  {
+                     APPLY_PRINT("%s - VoiceSupportMode Value is NULL\n", __FUNCTION__ );
+                  }
+               }
 #endif
 					paramObjVal = cJSON_GetObjectItem(cJSON_GetObjectItem( partnerObj, "Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.WANsideSSH.Enable"), "ActiveValue");
 					if ( paramObjVal != NULL )