diff --git a/scripts/db_migrator.py b/scripts/db_migrator.py
index 1aa9fb2804..deee4b553f 100755
--- a/scripts/db_migrator.py
+++ b/scripts/db_migrator.py
@@ -8,7 +8,9 @@
 import re
 
 from sonic_py_common import device_info, logger
+from swsssdk import ConfigDBConnector, SonicDBConfig
 from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector, SonicDBConfig
+from db_migrator_constants import RESTAPI, TELEMETRY, CONSOLE_SWITCH
 
 INIT_CFG_FILE = '/etc/sonic/init_cfg.json'
 
@@ -489,6 +491,61 @@ def migrate_qos_fieldval_reference_format(self):
         self.migrate_qos_db_fieldval_reference_remove(qos_table_list, self.configDB, self.configDB.CONFIG_DB, '|')
         return True
 
+    def migrate_vxlan_config(self):
+        log.log_notice('Migrate VXLAN table config')
+        # Collect VXLAN data from config DB
+        vxlan_data = self.configDB.keys(self.configDB.CONFIG_DB, "VXLAN_TUNNEL*")
+        if not vxlan_data:
+            # do nothing if vxlan entries are not present in configdb
+            return
+        for vxlan_table in vxlan_data:
+            vxlan_map_mapping = self.configDB.get_all(self.configDB.CONFIG_DB, vxlan_table)
+            tunnel_keys = vxlan_table.split(self.configDB.KEY_SEPARATOR)
+            tunnel_keys[0] = tunnel_keys[0] + "_TABLE"
+            vxlan_table = self.appDB.get_db_separator(self.appDB.APPL_DB).join(tunnel_keys)
+            for field, value in vxlan_map_mapping.items():
+                # add entries from configdb to appdb only when they are missing
+                if not self.appDB.hexists(self.appDB.APPL_DB, vxlan_table, field):
+                    log.log_notice('Copying vxlan entries from configdb to appdb: updated {} with {}:{}'.format(
+                        vxlan_table, field, value))
+                    self.appDB.set(self.appDB.APPL_DB, vxlan_table, field, value)
+
+    def migrate_restapi(self):
+        # RESTAPI - add missing key
+        log.log_notice('Migrate RESTAPI configuration')
+        config = self.configDB.get_entry('RESTAPI', 'config')
+        if not config:
+            self.configDB.set_entry("RESTAPI", "config", RESTAPI.get("config"))
+        certs = self.configDB.get_entry('RESTAPI', 'certs')
+        if not certs:
+            self.configDB.set_entry("RESTAPI", "certs", RESTAPI.get("certs"))
+
+    def migrate_telemetry(self):
+        # TELEMETRY - add missing key
+        log.log_notice('Migrate TELEMETRY configuration')
+        gnmi = self.configDB.get_entry('TELEMETRY', 'gnmi')
+        if not gnmi:
+            self.configDB.set_entry("TELEMETRY", "gnmi", TELEMETRY.get("gnmi"))
+        certs = self.configDB.get_entry('TELEMETRY', 'certs')
+        if not certs:
+            self.configDB.set_entry("TELEMETRY", "certs", TELEMETRY.get("certs"))
+
+    def migrate_console_switch(self):
+        # CONSOLE_SWITCH - add missing key
+        log.log_notice('Migrate CONSOLE_SWITCH configuration')
+        console_mgmt = self.configDB.get_entry('CONSOLE_SWITCH', 'console_mgmt')
+        if not console_mgmt:
+            self.configDB.set_entry("CONSOLE_SWITCH", "console_mgmt",
+                CONSOLE_SWITCH.get("console_mgmt"))
+
+    def migrate_device_metadata(self):
+        # DEVICE_METADATA - synchronous_mode entry
+        log.log_notice('Migrate DEVICE_METADATA missing configuration (synchronous_mode=enable)')
+        metadata = self.configDB.get_entry('DEVICE_METADATA', 'localhost')
+        if 'synchronous_mode' not in metadata:
+            metadata['synchronous_mode'] = 'enable'
+            self.configDB.set_entry('DEVICE_METADATA', 'localhost', metadata)
+
     def migrate_port_qos_map_global(self):
         """
         Generate dscp_to_tc_map for switch.
@@ -651,10 +708,25 @@ def version_2_0_0(self):
 
     def version_2_0_1(self):
         """
-        Version 2_0_1.
-        This is the latest version for 202012 branch 
+        Handle and migrate missing config that results from cross branch upgrade to
+        202012 as target.
         """
         log.log_info('Handling version_2_0_1')
+        self.migrate_vxlan_config()
+        self.migrate_restapi()
+        self.migrate_telemetry()
+        self.migrate_console_switch()
+        self.migrate_device_metadata()
+
+        self.set_version('version_2_0_2')
+        return 'version_2_0_2'
+
+    def version_2_0_2(self):
+        """
+        Version 2_0_2
+        This is the latest version for 202012 branch 
+        """
+        log.log_info('Handling version_2_0_2')
         self.set_version('version_3_0_0')
         return 'version_3_0_0'
 
diff --git a/scripts/db_migrator_constants.py b/scripts/db_migrator_constants.py
new file mode 100644
index 0000000000..71237a5655
--- /dev/null
+++ b/scripts/db_migrator_constants.py
@@ -0,0 +1,32 @@
+RESTAPI = {
+        "config": {
+            "client_auth": "true", 
+            "log_level": "info", 
+            "allow_insecure": "false"
+        }, 
+        "certs": {
+            "server_key": "/etc/sonic/credentials/restapiserver.key", 
+            "ca_crt": "/etc/sonic/credentials/AME_ROOT_CERTIFICATE.pem", 
+            "server_crt": "/etc/sonic/credentials/restapiserver.crt", 
+            "client_crt_cname": "client.restapi.sonic.gbl"
+        }
+    }
+
+TELEMETRY = {
+    "gnmi": {
+        "client_auth": "true", 
+        "log_level": "2", 
+        "port": "50051"
+    }, 
+    "certs": {
+        "server_key": "/etc/sonic/telemetry/streamingtelemetryserver.key", 
+        "ca_crt": "/etc/sonic/telemetry/dsmsroot.cer", 
+        "server_crt": "/etc/sonic/telemetry/streamingtelemetryserver.cer"
+    }
+}
+
+CONSOLE_SWITCH = {
+    "console_mgmt": {
+        "enabled": "no"
+    }
+}
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_1.json b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_1.json
index 731bcea1fe..c9e5c04a5f 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_1.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_1.json
@@ -731,6 +731,7 @@
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_2.json b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_2.json
index 9c01e38daf..07966ad742 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_2.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_2.json
@@ -737,7 +737,8 @@
         "default_pfcwd_status": "disable",
         "bgp_asn": "65100",
         "deployment_id": "1",
-        "type": "ToRRouter"
+        "type": "ToRRouter",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_3.json b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_3.json
index 2ef38d24ec..66f6c58284 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_3.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_3.json
@@ -737,7 +737,8 @@
         "default_pfcwd_status": "disable",
         "bgp_asn": "65100",
         "deployment_id": "1",
-        "type": "ToRRouter"
+        "type": "ToRRouter",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_4.json b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_4.json
index d92a6336b0..6848917e04 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_4.json
@@ -737,7 +737,8 @@
         "default_pfcwd_status": "disable",
         "bgp_asn": "65100",
         "deployment_id": "1",
-        "type": "ToRRouter"
+        "type": "ToRRouter",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_5.json
index 84eccb4978..96fd7dd809 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_5.json
@@ -737,7 +737,8 @@
         "default_pfcwd_status": "disable",
         "bgp_asn": "65100",
         "deployment_id": "1",
-        "type": "ToRRouter"
+        "type": "ToRRouter",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_6.json
index 98130c4baa..f549368983 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_1_0_6.json
@@ -737,7 +737,8 @@
         "default_pfcwd_status": "disable",
         "bgp_asn": "65100",
         "deployment_id": "1",
-        "type": "ToRRouter"
+        "type": "ToRRouter",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_0.json
index aab45921ab..4cab434e29 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_0.json
@@ -689,7 +689,8 @@
         "bgp_asn": "65100",
         "buffer_model": "dynamic",
         "deployment_id": "1",
-        "type": "ToRRouter"
+        "type": "ToRRouter",
+        "synchronous_mode": "enable"
     },
     "LOSSLESS_TRAFFIC_PATTERN|AZURE": {
         "small_packet_percentage": "100",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_3.json
index d740449d80..89f46af5c6 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_3.json
@@ -689,7 +689,8 @@
         "bgp_asn": "65100",
         "buffer_model": "dynamic",
         "deployment_id": "1",
-        "type": "ToRRouter"
+        "type": "ToRRouter",
+        "synchronous_mode": "enable"
     },
     "LOSSLESS_TRAFFIC_PATTERN|AZURE": {
         "small_packet_percentage": "100",
@@ -1016,4 +1017,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_1.json b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_1.json
index 62a74e7d50..c97f51d5a2 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_1.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_1.json
@@ -824,6 +824,7 @@
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_2.json b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_2.json
index 48c6e36a85..25d2701574 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_2.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_2.json
@@ -824,6 +824,7 @@
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_3.json b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_3.json
index 2f37a3e238..9a438f3b19 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_3.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_3.json
@@ -824,6 +824,7 @@
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_4.json b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_4.json
index 837abc8b5a..13758db256 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_4.json
@@ -824,6 +824,7 @@
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_5.json
index f24650a270..6557d7f90f 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_5.json
@@ -824,6 +824,7 @@
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_6.json
index b3b4b31275..205620de9f 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_1_0_6.json
@@ -824,6 +824,7 @@
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_0.json
index c3a9fb204e..d7698caccd 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_0.json
@@ -754,6 +754,7 @@
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_3.json
index d77a409598..b9ad1706a8 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_3.json
@@ -761,7 +761,8 @@
         "bgp_asn": "65100",
         "buffer_model": "dynamic",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "unified",
+        "synchronous_mode": "enable"
     },
     "LOSSLESS_TRAFFIC_PATTERN|AZURE": {
         "small_packet_percentage": "100",
@@ -1088,4 +1089,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_2.json b/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_2.json
index dad6528bd1..e3bb4f100d 100644
--- a/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_2.json
+++ b/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_2.json
@@ -738,6 +738,7 @@
         "hwsku": "ACS-MSN3700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn3700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_3.json b/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_3.json
index ed90ec38f2..ee33adc896 100644
--- a/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_3.json
+++ b/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_3.json
@@ -864,6 +864,7 @@
         "hwsku": "ACS-MSN3700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn3700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_4.json b/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_4.json
index 508dc5dc7f..45af1c2997 100644
--- a/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_4.json
@@ -864,6 +864,7 @@
         "hwsku": "ACS-MSN3700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn3700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_5.json
index 4ed4668d8b..04448a2667 100644
--- a/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_5.json
@@ -864,6 +864,7 @@
         "hwsku": "ACS-MSN3700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn3700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_6.json
index 48ba24ab3b..825d3c495d 100644
--- a/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/acs-msn3700-t0-version_1_0_6.json
@@ -864,6 +864,7 @@
         "hwsku": "ACS-MSN3700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn3700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn3700-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/acs-msn3700-t0-version_3_0_0.json
index 6bc2ee545b..18876fb486 100644
--- a/tests/db_migrator_input/config_db/acs-msn3700-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/acs-msn3700-t0-version_3_0_0.json
@@ -808,6 +808,7 @@
         "hwsku": "ACS-MSN3700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn3700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn3700-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/acs-msn3700-t0-version_3_0_3.json
index ea78053bb0..eb6138bdc6 100644
--- a/tests/db_migrator_input/config_db/acs-msn3700-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/acs-msn3700-t0-version_3_0_3.json
@@ -817,7 +817,8 @@
         "buffer_model": "dynamic",
         "deployment_id": "1",
         "docker_routing_config_mode": "separated",
-        "cloudtype": "None"
+        "cloudtype": "None",
+        "synchronous_mode": "enable"
     },
     "LOSSLESS_TRAFFIC_PATTERN|AZURE": {
         "small_packet_percentage": "100",
@@ -1902,4 +1903,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_2.json b/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_2.json
index d2a1290368..80d96b8bc5 100644
--- a/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_2.json
+++ b/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_2.json
@@ -838,6 +838,7 @@
         "hwsku": "ACS-MSN3700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn3700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_3.json b/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_3.json
index 57b106555b..0743a08bf9 100644
--- a/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_3.json
+++ b/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_3.json
@@ -940,6 +940,7 @@
         "hwsku": "ACS-MSN3700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn3700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_4.json b/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_4.json
index e97efaa06d..764e2639fd 100644
--- a/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_4.json
@@ -940,6 +940,7 @@
         "hwsku": "ACS-MSN3700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn3700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_5.json
index 0e4d8035b6..431218c6c1 100644
--- a/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_5.json
@@ -940,6 +940,7 @@
         "hwsku": "ACS-MSN3700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn3700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_6.json
index bb26b43b58..a815bf97d6 100644
--- a/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/acs-msn3700-t1-version_1_0_6.json
@@ -940,6 +940,7 @@
         "hwsku": "ACS-MSN3700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn3700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn3700-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/acs-msn3700-t1-version_3_0_0.json
index 919888d8c3..c3fb115b8e 100644
--- a/tests/db_migrator_input/config_db/acs-msn3700-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/acs-msn3700-t1-version_3_0_0.json
@@ -856,6 +856,7 @@
         "hwsku": "ACS-MSN3700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn3700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn3700-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/acs-msn3700-t1-version_3_0_3.json
index 62d00c4e4d..fc34c0870e 100644
--- a/tests/db_migrator_input/config_db/acs-msn3700-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/acs-msn3700-t1-version_3_0_3.json
@@ -865,7 +865,8 @@
         "buffer_model": "dynamic",
         "deployment_id": "1",
         "docker_routing_config_mode": "separated",
-        "cloudtype": "None"
+        "cloudtype": "None",
+        "synchronous_mode": "enable"
     },
     "LOSSLESS_TRAFFIC_PATTERN|AZURE": {
         "small_packet_percentage": "100",
@@ -1950,4 +1951,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/acs-msn3800-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/acs-msn3800-t0-version_1_0_5.json
index b6fddf6215..df40c5049a 100644
--- a/tests/db_migrator_input/config_db/acs-msn3800-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/acs-msn3800-t0-version_1_0_5.json
@@ -988,6 +988,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/acs-msn3800-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/acs-msn3800-t0-version_1_0_6.json
index c655ab4dee..aadef8ed0b 100644
--- a/tests/db_migrator_input/config_db/acs-msn3800-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/acs-msn3800-t0-version_1_0_6.json
@@ -988,6 +988,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/acs-msn3800-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/acs-msn3800-t0-version_3_0_0.json
index 71a0c751e7..13723251c2 100644
--- a/tests/db_migrator_input/config_db/acs-msn3800-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/acs-msn3800-t0-version_3_0_0.json
@@ -971,6 +971,7 @@
         "buffer_model": "dynamic",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "LOSSLESS_TRAFFIC_PATTERN|AZURE": {
diff --git a/tests/db_migrator_input/config_db/acs-msn3800-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/acs-msn3800-t0-version_3_0_3.json
index 8d8451165e..a1f6a8e1f1 100644
--- a/tests/db_migrator_input/config_db/acs-msn3800-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/acs-msn3800-t0-version_3_0_3.json
@@ -971,7 +971,8 @@
         "buffer_model": "dynamic",
         "cloudtype": "None",
         "type": "ToRRouter",
-        "deployment_id": "1"
+        "deployment_id": "1",
+        "synchronous_mode": "enable"
     },
     "LOSSLESS_TRAFFIC_PATTERN|AZURE": {
         "small_packet_percentage": "100",
@@ -2036,4 +2037,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/acs-msn3800-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/acs-msn3800-t1-version_1_0_5.json
index 9ea07af0f9..2916e541ca 100644
--- a/tests/db_migrator_input/config_db/acs-msn3800-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/acs-msn3800-t1-version_1_0_5.json
@@ -1102,6 +1102,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/acs-msn3800-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/acs-msn3800-t1-version_1_0_6.json
index 049834652e..e80ca33864 100644
--- a/tests/db_migrator_input/config_db/acs-msn3800-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/acs-msn3800-t1-version_1_0_6.json
@@ -1102,6 +1102,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/acs-msn3800-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/acs-msn3800-t1-version_3_0_0.json
index 97bdf8f23d..b399934c77 100644
--- a/tests/db_migrator_input/config_db/acs-msn3800-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/acs-msn3800-t1-version_3_0_0.json
@@ -1019,6 +1019,7 @@
         "buffer_model": "dynamic",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "LOSSLESS_TRAFFIC_PATTERN|AZURE": {
diff --git a/tests/db_migrator_input/config_db/acs-msn3800-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/acs-msn3800-t1-version_3_0_3.json
index 70b8b316c7..d97c95c537 100644
--- a/tests/db_migrator_input/config_db/acs-msn3800-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/acs-msn3800-t1-version_3_0_3.json
@@ -1019,7 +1019,8 @@
         "buffer_model": "dynamic",
         "cloudtype": "None",
         "type": "LeafRouter",
-        "deployment_id": "1"
+        "deployment_id": "1",
+        "synchronous_mode": "enable"
     },
     "LOSSLESS_TRAFFIC_PATTERN|AZURE": {
         "small_packet_percentage": "100",
@@ -2084,4 +2085,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/acs-msn4700-t0-version_1_0_4.json b/tests/db_migrator_input/config_db/acs-msn4700-t0-version_1_0_4.json
index 34b697493e..1e71535a50 100644
--- a/tests/db_migrator_input/config_db/acs-msn4700-t0-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/acs-msn4700-t0-version_1_0_4.json
@@ -745,6 +745,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn4700-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/acs-msn4700-t0-version_1_0_5.json
index 313ca97934..c90b68bee5 100644
--- a/tests/db_migrator_input/config_db/acs-msn4700-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/acs-msn4700-t0-version_1_0_5.json
@@ -949,6 +949,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn4700-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/acs-msn4700-t0-version_1_0_6.json
index 1eb7bc9ff0..553cd3fdce 100644
--- a/tests/db_migrator_input/config_db/acs-msn4700-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/acs-msn4700-t0-version_1_0_6.json
@@ -949,6 +949,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn4700-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/acs-msn4700-t0-version_3_0_0.json
index a3085167ae..a421b638f1 100644
--- a/tests/db_migrator_input/config_db/acs-msn4700-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/acs-msn4700-t0-version_3_0_0.json
@@ -886,6 +886,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn4700-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/acs-msn4700-t0-version_3_0_3.json
index dc40c8fe71..b00b45ac2f 100644
--- a/tests/db_migrator_input/config_db/acs-msn4700-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/acs-msn4700-t0-version_3_0_3.json
@@ -886,6 +886,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn4700-t1-version_1_0_4.json b/tests/db_migrator_input/config_db/acs-msn4700-t1-version_1_0_4.json
index 763342e143..5adef7f9e4 100644
--- a/tests/db_migrator_input/config_db/acs-msn4700-t1-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/acs-msn4700-t1-version_1_0_4.json
@@ -1050,6 +1050,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn4700-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/acs-msn4700-t1-version_1_0_5.json
index c043e37bf0..a71bc64979 100644
--- a/tests/db_migrator_input/config_db/acs-msn4700-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/acs-msn4700-t1-version_1_0_5.json
@@ -1050,6 +1050,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn4700-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/acs-msn4700-t1-version_1_0_6.json
index 6716ec67b4..6bcb4affc8 100644
--- a/tests/db_migrator_input/config_db/acs-msn4700-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/acs-msn4700-t1-version_1_0_6.json
@@ -1050,6 +1050,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn4700-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/acs-msn4700-t1-version_3_0_0.json
index 8698a6bcca..5b6ff7d6a2 100644
--- a/tests/db_migrator_input/config_db/acs-msn4700-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/acs-msn4700-t1-version_3_0_0.json
@@ -952,6 +952,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/acs-msn4700-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/acs-msn4700-t1-version_3_0_3.json
index aec14ade88..3aedb14d17 100644
--- a/tests/db_migrator_input/config_db/acs-msn4700-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/acs-msn4700-t1-version_3_0_3.json
@@ -952,6 +952,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_expected.json b/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_expected.json
new file mode 100644
index 0000000000..c975229287
--- /dev/null
+++ b/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_expected.json
@@ -0,0 +1,26 @@
+{
+    "RESTAPI|config": {
+            "client_auth": "true", 
+            "log_level": "info", 
+            "allow_insecure": "false"
+        },
+    "RESTAPI|certs": {
+            "server_key": "/etc/sonic/credentials/restapiserver.key", 
+            "ca_crt": "/etc/sonic/credentials/AME_ROOT_CERTIFICATE.pem", 
+            "server_crt": "/etc/sonic/credentials/restapiserver.crt", 
+            "client_crt_cname": "client.restapi.sonic.gbl"
+        },
+    "TELEMETRY|gnmi": {
+            "client_auth": "true", 
+            "log_level": "2", 
+            "port": "50051"
+        }, 
+    "TELEMETRY|certs": {
+            "server_key": "/etc/sonic/telemetry/streamingtelemetryserver.key", 
+            "ca_crt": "/etc/sonic/telemetry/dsmsroot.cer", 
+            "server_crt": "/etc/sonic/telemetry/streamingtelemetryserver.cer"
+        },
+    "CONSOLE_SWITCH|console_mgmt": {
+            "enabled": "no"
+        }
+}
diff --git a/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_input.json b/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_input.json
new file mode 100644
index 0000000000..bfd870e452
--- /dev/null
+++ b/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_input.json
@@ -0,0 +1,3 @@
+{
+}
+
diff --git a/tests/db_migrator_input/config_db/empty-config-expected.json b/tests/db_migrator_input/config_db/empty-config-expected.json
index b837c97a08..eebe7eafbd 100644
--- a/tests/db_migrator_input/config_db/empty-config-expected.json
+++ b/tests/db_migrator_input/config_db/empty-config-expected.json
@@ -1,5 +1,8 @@
 {
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
+    },
+    "DEVICE_METADATA|localhost": {
+        "synchronous_mode": "enable"
     }
 }
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_1_0_4.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_1_0_4.json
index 4509a55587..8add09883a 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_1_0_4.json
@@ -726,6 +726,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_1_0_5.json
index 44c05c9dfb..af2f6b4d5f 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_1_0_5.json
@@ -727,6 +727,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_1_0_6.json
index c5369e6344..9881ff7ba8 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_1_0_6.json
@@ -727,6 +727,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_0.json
index 043d77414d..f9d6c6ce92 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_0.json
@@ -727,6 +727,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_3.json
index d74f741124..e6cf41110b 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_3.json
@@ -734,7 +734,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "unified",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
@@ -1057,4 +1058,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_1_0_4.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_1_0_4.json
index 0acf1b0fac..c89504ce61 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_1_0_4.json
@@ -819,6 +819,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_1_0_5.json
index 91e78b8b96..c8464391d0 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_1_0_5.json
@@ -820,6 +820,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_1_0_6.json
index c7d7070c74..16845fd95e 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_1_0_6.json
@@ -820,6 +820,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_0.json
index d53fc65467..a77c75e9c1 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_0.json
@@ -820,6 +820,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_3.json
index 3b6c1d9774..81f6b1f1ce 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_3.json
@@ -827,7 +827,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "unified",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
@@ -1150,4 +1151,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_1.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_1.json
index b85b85118c..e960998c4b 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_1.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_1.json
@@ -731,6 +731,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_2.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_2.json
index 6648cce024..f4c80a0136 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_2.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_2.json
@@ -731,6 +731,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_3.json
index c80dce5874..920f88d462 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_3.json
@@ -731,6 +731,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_4.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_4.json
index 2ba6c8253a..d150d1a306 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_4.json
@@ -731,6 +731,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_5.json
index 70e25898ce..e3ff2f75da 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_5.json
@@ -732,6 +732,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_6.json
index 8b978e50ac..2f79723493 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_1_0_6.json
@@ -732,6 +732,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_0.json
index 747e332769..dac897f792 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_0.json
@@ -732,6 +732,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_3.json
index 842ef4f2ab..76d095e995 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_3.json
@@ -739,7 +739,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "unified",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
@@ -1062,4 +1063,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_1.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_1.json
index 7ec20f8cec..b5e515a4af 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_1.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_1.json
@@ -824,6 +824,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_2.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_2.json
index 31a1179ad2..472550b670 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_2.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_2.json
@@ -824,6 +824,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_3.json
index 855b16afc3..6c562bc0c8 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_3.json
@@ -824,6 +824,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_4.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_4.json
index 2b0ad78528..13e241b808 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_4.json
@@ -824,6 +824,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_5.json
index 19aeca0bc9..2890da1306 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_5.json
@@ -825,6 +825,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_6.json
index 9c6b896de5..8098a3cf3b 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_1_0_6.json
@@ -825,6 +825,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_0.json
index 67ff5f7e27..05ca9f95fb 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_0.json
@@ -825,6 +825,7 @@
         "hwsku": "Mellanox-SN2700-C28D8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_3.json
index 64294841da..abccee2062 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_3.json
@@ -832,7 +832,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "unified",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
@@ -1155,4 +1156,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_1_0_5.json
index 752f4001c1..f0ef79e917 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_1_0_5.json
@@ -727,6 +727,7 @@
         "hwsku": "Mellanox-SN2700-D40C8S8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_1_0_6.json
index 288e0e727f..97bfefde06 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_1_0_6.json
@@ -727,6 +727,7 @@
         "hwsku": "Mellanox-SN2700-D40C8S8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_0.json
index 4974c1801e..cae7a8de89 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_0.json
@@ -727,6 +727,7 @@
         "hwsku": "Mellanox-SN2700-D40C8S8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_3.json
index 72e6ba3fd9..9367e7d6df 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_3.json
@@ -734,7 +734,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "unified",
+        "synchronous_mode": "enable" 
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
@@ -1057,4 +1058,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_1_0_5.json
index 94ec238858..770a586427 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_1_0_5.json
@@ -820,6 +820,7 @@
         "hwsku": "Mellanox-SN2700-D40C8S8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_1_0_6.json
index b848c67791..998a3f39ed 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_1_0_6.json
@@ -820,6 +820,7 @@
         "hwsku": "Mellanox-SN2700-D40C8S8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_0.json
index b0a79247e8..51f0ab67af 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_0.json
@@ -820,6 +820,7 @@
         "hwsku": "Mellanox-SN2700-D40C8S8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_3.json
index fb617e0bca..c2f12ef94c 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_3.json
@@ -827,7 +827,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "unified",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
@@ -1150,4 +1151,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_1_0_4.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_1_0_4.json
index 53921af16f..5854e6456e 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_1_0_4.json
@@ -726,6 +726,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_1_0_5.json
index 9e3c1387a3..ea741ecae1 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_1_0_5.json
@@ -727,6 +727,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_1_0_6.json
index 60e34b7012..4ca5faa56f 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_1_0_6.json
@@ -727,6 +727,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_0.json
index 8b3d46d032..9aeb0b2b31 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_0.json
@@ -727,6 +727,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_3.json
index 0ae92bac07..52b9c7f58c 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_3.json
@@ -734,7 +734,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "unified",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
@@ -1057,4 +1058,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_1_0_4.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_1_0_4.json
index 647a0eeff0..6486ebdb2c 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_1_0_4.json
@@ -819,6 +819,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_1_0_5.json
index ed3bf55e60..3ae16cd145 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_1_0_5.json
@@ -820,6 +820,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_1_0_6.json
index a57f2b6842..853bb5c17b 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_1_0_6.json
@@ -820,6 +820,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_0.json
index a5f8b14f9e..6add5489d1 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_0.json
@@ -820,6 +820,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_3.json
index f861817758..082bd15765 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_3.json
@@ -827,7 +827,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "unified",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
@@ -1150,4 +1151,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_1.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_1.json
index 2e9f075fb0..379445f819 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_1.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_1.json
@@ -731,6 +731,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_2.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_2.json
index 1bb45cc2ce..3794807637 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_2.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_2.json
@@ -731,6 +731,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_3.json
index 6df051fab2..6677793096 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_3.json
@@ -731,6 +731,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_4.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_4.json
index 83edfa3b5d..819e670ce6 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_4.json
@@ -731,6 +731,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_5.json
index 87788b7bb8..6e351f2a76 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_5.json
@@ -732,6 +732,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_6.json
index e531918185..1e61a9e935 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_1_0_6.json
@@ -732,6 +732,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_0.json
index 0d8f258c08..adf0fb31ac 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_0.json
@@ -732,6 +732,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_3.json
index abaa38c2c4..5282b3e73e 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_3.json
@@ -739,7 +739,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "unified",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
@@ -1062,4 +1063,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_1.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_1.json
index 93b622b860..eaedbbb102 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_1.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_1.json
@@ -824,6 +824,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_2.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_2.json
index 5fea4f31b5..52f3d5070c 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_2.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_2.json
@@ -824,6 +824,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_3.json
index 69331752c6..51fecae2da 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_3.json
@@ -824,6 +824,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_4.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_4.json
index 226ecf053d..b18cc6e41e 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_4.json
@@ -824,6 +824,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_5.json
index f1a2f4fc9b..7b22d88c95 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_5.json
@@ -825,6 +825,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_6.json
index e43f55ee8f..7ae6b09098 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_1_0_6.json
@@ -825,6 +825,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_0.json
index 17a2cc0bc6..09df55a46b 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_0.json
@@ -825,6 +825,7 @@
         "hwsku": "Mellanox-SN2700-D48C8",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_3.json
index af7744f190..e20f0dce78 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_3.json
@@ -832,7 +832,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "unified",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
@@ -1155,4 +1156,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_1_0_4.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_1_0_4.json
index fdc77e9a4b..478aa3dc70 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_1_0_4.json
@@ -732,7 +732,8 @@
         "default_pfcwd_status": "disable",
         "bgp_asn": "65100",
         "deployment_id": "1",
-        "type": "ToRRouter"
+        "type": "ToRRouter",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_1_0_5.json
index 0e0d4e91b9..ead6486d17 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_1_0_5.json
@@ -733,7 +733,8 @@
         "default_pfcwd_status": "disable",
         "bgp_asn": "65100",
         "deployment_id": "1",
-        "type": "ToRRouter"
+        "type": "ToRRouter",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_1_0_6.json
index 37a3cc2bf3..d20b0db1fa 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_1_0_6.json
@@ -733,7 +733,8 @@
         "default_pfcwd_status": "disable",
         "bgp_asn": "65100",
         "deployment_id": "1",
-        "type": "ToRRouter"
+        "type": "ToRRouter",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_0.json
index 89d5fda174..e0f5d3fbb8 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_0.json
@@ -734,7 +734,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "type": "ToRRouter"
+        "type": "ToRRouter",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_3.json
index 96afbca2cb..39956f85ed 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_3.json
@@ -734,7 +734,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "type": "ToRRouter"
+        "type": "ToRRouter",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
@@ -1057,4 +1058,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_1_0_4.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_1_0_4.json
index c99bad1dc6..5c876d66ff 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_1_0_4.json
@@ -819,6 +819,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_1_0_5.json
index 4bf50c3456..bb5b2da3ba 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_1_0_5.json
@@ -820,6 +820,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_1_0_6.json
index 8c35bd19de..b290fd57e9 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_1_0_6.json
@@ -820,6 +820,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_0.json
index 323afdd76d..b72e1498c4 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_0.json
@@ -820,6 +820,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_3.json
index 1ca4b8ae65..28b01ee3fb 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_3.json
@@ -827,7 +827,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "unified",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
@@ -1150,4 +1151,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_1.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_1.json
index 4a38a382f1..94ecade338 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_1.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_1.json
@@ -731,6 +731,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_2.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_2.json
index da5d5ebef3..f97f5dd554 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_2.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_2.json
@@ -731,6 +731,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_3.json
index c518a0a9ce..3843271a45 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_3.json
@@ -731,6 +731,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_4.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_4.json
index de29236261..80a9ff5c08 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_4.json
@@ -731,6 +731,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_5.json
index 967726dbb3..0f078f7071 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_5.json
@@ -732,6 +732,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_6.json
index 088c63f519..9fdbcf7a20 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_1_0_6.json
@@ -732,6 +732,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_0.json
index 8ffe560550..3b614fe042 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_0.json
@@ -732,6 +732,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_3.json
index b29b89a6f6..7bc0720ec9 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_3.json
@@ -739,7 +739,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "unified",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
@@ -1062,4 +1063,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_1.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_1.json
index e0b75fa484..eaabe74697 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_1.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_1.json
@@ -824,6 +824,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_2.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_2.json
index 5a78582246..d98d906e46 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_2.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_2.json
@@ -824,6 +824,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_3.json
index a54358373c..15333f0052 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_3.json
@@ -824,6 +824,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_4.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_4.json
index 5b1bceeabb..6bb8c338db 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_4.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_4.json
@@ -824,6 +824,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_5.json
index 76ec1bb52c..feb158e4a7 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_5.json
@@ -825,6 +825,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_6.json
index 81f7377f84..a5eaedbb85 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_1_0_6.json
@@ -825,6 +825,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_0.json
index 84c0f26e19..a53b1bbda7 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_0.json
@@ -825,6 +825,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_3.json
index cebc316720..203ac2171f 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_3.json
@@ -832,7 +832,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "unified",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
@@ -1155,4 +1156,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_1_0_5.json
index 94d64196ab..79bd49a9a4 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_1_0_5.json
@@ -704,6 +704,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_1_0_6.json
index e0d47020e5..3b7815cc1a 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_1_0_6.json
@@ -704,6 +704,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_3_0_0.json
index 122376743c..6422d9ce10 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_3_0_0.json
@@ -705,6 +705,7 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_3_0_3.json
index b799c3897a..027cc5325c 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t0-version_3_0_3.json
@@ -705,7 +705,8 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "ToRRouter",
-        "deployment_id": "1"
+        "deployment_id": "1",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "index": "0",
@@ -1766,4 +1767,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_1_0_5.json
index a299500e52..6256051591 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_1_0_5.json
@@ -826,6 +826,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_1_0_6.json
index e5f078c959..0961703d95 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_1_0_6.json
@@ -826,6 +826,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_3_0_0.json
index ffc516678f..d172932f50 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_3_0_0.json
@@ -827,6 +827,7 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_3_0_3.json
index bae0caedf1..c0ca921d94 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-c64-t1-version_3_0_3.json
@@ -827,7 +827,8 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "LeafRouter",
-        "deployment_id": "1"
+        "deployment_id": "1",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "index": "0",
@@ -1888,4 +1889,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_1_0_5.json
index 3d1650b1fc..85c078c8cb 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_1_0_5.json
@@ -984,6 +984,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_1_0_6.json
index 85664d39ef..9db400fb93 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_1_0_6.json
@@ -984,6 +984,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_3_0_0.json
index c6b81cd314..85c2cfbabe 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_3_0_0.json
@@ -985,6 +985,7 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_3_0_3.json
index e44770b371..41b514410f 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t0-version_3_0_3.json
@@ -985,7 +985,8 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "ToRRouter",
-        "deployment_id": "1"
+        "deployment_id": "1",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "index": "0",
@@ -2046,4 +2047,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_1_0_5.json
index f0576552a1..c7809b711d 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_1_0_5.json
@@ -1098,6 +1098,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_1_0_6.json
index 9e08f652fe..2bf0ab7029 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_1_0_6.json
@@ -1098,6 +1098,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_3_0_0.json
index 36877e0653..349bd02ff7 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_3_0_0.json
@@ -1099,6 +1099,7 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_3_0_3.json
index 1db7804072..a3c05d3bb2 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d112c8-t1-version_3_0_3.json
@@ -1099,7 +1099,8 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "LeafRouter",
-        "deployment_id": "1"
+        "deployment_id": "1",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "index": "0",
@@ -2160,4 +2161,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_1_0_5.json
index 9b331a15d5..7808bc4545 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_1_0_5.json
@@ -704,6 +704,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_1_0_6.json
index edefc7e4bf..a765865644 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_1_0_6.json
@@ -704,6 +704,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_3_0_0.json
index bcbb6cb3fc..9394215698 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_3_0_0.json
@@ -705,6 +705,7 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_3_0_3.json
index ee0e7e0065..0d5131d574 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t0-version_3_0_3.json
@@ -705,7 +705,8 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "ToRRouter",
-        "deployment_id": "1"
+        "deployment_id": "1",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "index": "0",
@@ -1766,4 +1767,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_1_0_5.json
index 5a0c41c854..875df36443 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_1_0_5.json
@@ -826,6 +826,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_1_0_6.json
index 5a0c41c854..875df36443 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_1_0_6.json
@@ -826,6 +826,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_3_0_0.json
index 408fe08bbc..07790160c8 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_3_0_0.json
@@ -827,6 +827,7 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_3_0_3.json
index 96367faeaf..a6cd6671f0 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d24c52-t1-version_3_0_3.json
@@ -827,7 +827,8 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "LeafRouter",
-        "deployment_id": "1"
+        "deployment_id": "1",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "index": "0",
@@ -1888,4 +1889,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_1_0_5.json
index 340de9a2fe..0cf0683206 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_1_0_5.json
@@ -704,6 +704,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_1_0_6.json
index 5d439de320..760dc26fa9 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_1_0_6.json
@@ -704,6 +704,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_3_0_0.json
index 87d27836b5..3e2998210f 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_3_0_0.json
@@ -705,6 +705,7 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_3_0_3.json
index a267b49c01..67971e733c 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t0-version_3_0_3.json
@@ -705,7 +705,8 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "ToRRouter",
-        "deployment_id": "1"
+        "deployment_id": "1",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "index": "0",
@@ -1766,4 +1767,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_1_0_5.json
index 97403e343d..5cd8f639a8 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_1_0_5.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_1_0_5.json
@@ -826,6 +826,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_1_0_6.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_1_0_6.json
index 97403e343d..5cd8f639a8 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_1_0_6.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_1_0_6.json
@@ -826,6 +826,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_3_0_0.json
index a22fe139e3..3448ef3a35 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_3_0_0.json
@@ -827,6 +827,7 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_3_0_3.json
index c5e62e2795..cb94646dca 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn3800-d28c50-t1-version_3_0_3.json
@@ -827,7 +827,8 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "LeafRouter",
-        "deployment_id": "1"
+        "deployment_id": "1",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "index": "0",
@@ -1888,4 +1889,4 @@
     "VERSIONS|DATABASE": {
         "VERSION": "version_3_0_3"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/db_migrator_input/config_db/non-default-config-expected.json b/tests/db_migrator_input/config_db/non-default-config-expected.json
index 55cca5cb48..13ae7aa2f3 100644
--- a/tests/db_migrator_input/config_db/non-default-config-expected.json
+++ b/tests/db_migrator_input/config_db/non-default-config-expected.json
@@ -762,7 +762,8 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "type": "ToRRouter"
+        "type": "ToRRouter",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "index": "1",
diff --git a/tests/db_migrator_input/config_db/non-default-config-input.json b/tests/db_migrator_input/config_db/non-default-config-input.json
index b806793fc4..3cdd352729 100644
--- a/tests/db_migrator_input/config_db/non-default-config-input.json
+++ b/tests/db_migrator_input/config_db/non-default-config-input.json
@@ -737,7 +737,8 @@
         "default_pfcwd_status": "disable",
         "bgp_asn": "65100",
         "deployment_id": "1",
-        "type": "ToRRouter"
+        "type": "ToRRouter",
+        "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/non-default-lossless-profile-in-pg-expected.json b/tests/db_migrator_input/config_db/non-default-lossless-profile-in-pg-expected.json
index ed18c0a859..fd7241724d 100644
--- a/tests/db_migrator_input/config_db/non-default-lossless-profile-in-pg-expected.json
+++ b/tests/db_migrator_input/config_db/non-default-lossless-profile-in-pg-expected.json
@@ -956,6 +956,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/non-default-lossless-profile-in-pg-input.json b/tests/db_migrator_input/config_db/non-default-lossless-profile-in-pg-input.json
index 94e3f8004d..a043137f28 100644
--- a/tests/db_migrator_input/config_db/non-default-lossless-profile-in-pg-input.json
+++ b/tests/db_migrator_input/config_db/non-default-lossless-profile-in-pg-input.json
@@ -956,6 +956,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/non-default-lossy-profile-in-pg-expected.json b/tests/db_migrator_input/config_db/non-default-lossy-profile-in-pg-expected.json
index 6017b6a356..fd8550953e 100644
--- a/tests/db_migrator_input/config_db/non-default-lossy-profile-in-pg-expected.json
+++ b/tests/db_migrator_input/config_db/non-default-lossy-profile-in-pg-expected.json
@@ -954,6 +954,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/non-default-lossy-profile-in-pg-input.json b/tests/db_migrator_input/config_db/non-default-lossy-profile-in-pg-input.json
index 85d5da7ea8..e6c28d0c1d 100644
--- a/tests/db_migrator_input/config_db/non-default-lossy-profile-in-pg-input.json
+++ b/tests/db_migrator_input/config_db/non-default-lossy-profile-in-pg-input.json
@@ -954,6 +954,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/non-default-pg-expected.json b/tests/db_migrator_input/config_db/non-default-pg-expected.json
index 314ac69318..2a0aa78699 100644
--- a/tests/db_migrator_input/config_db/non-default-pg-expected.json
+++ b/tests/db_migrator_input/config_db/non-default-pg-expected.json
@@ -952,6 +952,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/non-default-pg-input.json b/tests/db_migrator_input/config_db/non-default-pg-input.json
index 87c8d59a0c..0592451717 100644
--- a/tests/db_migrator_input/config_db/non-default-pg-input.json
+++ b/tests/db_migrator_input/config_db/non-default-pg-input.json
@@ -952,6 +952,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/non-default-xoff-expected.json b/tests/db_migrator_input/config_db/non-default-xoff-expected.json
index ee68ba5745..29075900f7 100644
--- a/tests/db_migrator_input/config_db/non-default-xoff-expected.json
+++ b/tests/db_migrator_input/config_db/non-default-xoff-expected.json
@@ -990,6 +990,7 @@
         "buffer_model": "traditional",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/non-default-xoff-input.json b/tests/db_migrator_input/config_db/non-default-xoff-input.json
index aa9d8574ea..032e6112ac 100644
--- a/tests/db_migrator_input/config_db/non-default-xoff-input.json
+++ b/tests/db_migrator_input/config_db/non-default-xoff-input.json
@@ -989,6 +989,7 @@
         "bgp_asn": "65100",
         "cloudtype": "None",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "deployment_id": "1"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/qos_tables_db_field_value_reference_format_3_0_1.json b/tests/db_migrator_input/config_db/qos_tables_db_field_value_reference_format_3_0_1.json
index 7d7e237a75..b252cba1dd 100644
--- a/tests/db_migrator_input/config_db/qos_tables_db_field_value_reference_format_3_0_1.json
+++ b/tests/db_migrator_input/config_db/qos_tables_db_field_value_reference_format_3_0_1.json
@@ -1050,7 +1050,8 @@
             "hwsku": "DellEMC-Z9264f-C64",
             "mac": "50:9a:4c:d3:86:70",
             "platform": "x86_64-dellemc_z9264f_c3538-r0",
-            "type": "LeafRouter"
+            "type": "LeafRouter",
+            "synchronous_mode": "enable"
         }
     },
     "DSCP_TO_TC_MAP": {
diff --git a/tests/db_migrator_input/config_db/qos_tables_db_field_value_reference_format_3_0_3.json b/tests/db_migrator_input/config_db/qos_tables_db_field_value_reference_format_3_0_3.json
index 492528989b..1f4390a9c4 100644
--- a/tests/db_migrator_input/config_db/qos_tables_db_field_value_reference_format_3_0_3.json
+++ b/tests/db_migrator_input/config_db/qos_tables_db_field_value_reference_format_3_0_3.json
@@ -1050,7 +1050,8 @@
             "hwsku": "DellEMC-Z9264f-C64",
             "mac": "50:9a:4c:d3:86:70",
             "platform": "x86_64-dellemc_z9264f_c3538-r0",
-            "type": "LeafRouter"
+            "type": "LeafRouter",
+            "synchronous_mode": "enable"
         }
     },
     "DSCP_TO_TC_MAP": {
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-expected.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-expected.json
index 88d81e5cff..a5126017bf 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-expected.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-expected.json
@@ -199,6 +199,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-input.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-input.json
index 691572ea3e..df58b4e54b 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-input.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-input.json
@@ -115,6 +115,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-expected.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-expected.json
index fdd4e35807..7bd0dd25a0 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-expected.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-expected.json
@@ -195,6 +195,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-input.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-input.json
index c43d7e7f3c..b2ea5f52c3 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-input.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-input.json
@@ -111,6 +111,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-expected.json b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-expected.json
index 97eed056b3..d1537d3d3d 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-expected.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-expected.json
@@ -258,6 +258,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-input.json b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-input.json
index bb3ded3b33..35fc6a6a92 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-input.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-input.json
@@ -150,6 +150,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-expected.json b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-expected.json
index 8cbe35ffb0..4c1518c43a 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-expected.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-expected.json
@@ -253,6 +253,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-input.json b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-input.json
index 1b6cc7138f..408afb409e 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-input.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-input.json
@@ -150,6 +150,7 @@
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
         "type": "ToRRouter",
+        "synchronous_mode": "enable",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-warmreboot-expected.json b/tests/db_migrator_input/config_db/reclaiming-buffer-warmreboot-expected.json
index f38c426b18..d2742a4df4 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-warmreboot-expected.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-warmreboot-expected.json
@@ -952,6 +952,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-warmreboot-input.json b/tests/db_migrator_input/config_db/reclaiming-buffer-warmreboot-input.json
index e8a44eb4ed..254af10b37 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-warmreboot-input.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-warmreboot-input.json
@@ -1047,6 +1047,7 @@
         "hwsku": "ACS-MSN4700",
         "default_bgp_status": "up",
         "type": "LeafRouter",
+        "synchronous_mode": "enable",
         "region": "None",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn4700-r0",
diff --git a/tests/db_migrator_test.py b/tests/db_migrator_test.py
index 4cf5383669..4571d9b1b0 100644
--- a/tests/db_migrator_test.py
+++ b/tests/db_migrator_test.py
@@ -450,3 +450,29 @@ def test_move_logger_tables_in_warm_upgrade(self):
 
         diff = DeepDiff(resulting_table, expected_table, ignore_order=True)
         assert not diff
+
+class TestWarmUpgrade_to_2_0_2(object):
+    @classmethod
+    def setup_class(cls):
+        os.environ['UTILITIES_UNIT_TESTING'] = "2"
+
+    @classmethod
+    def teardown_class(cls):
+        os.environ['UTILITIES_UNIT_TESTING'] = "0"
+        dbconnector.dedicated_dbs['CONFIG_DB'] = None
+
+    def test_warm_upgrade_to_2_0_2(self):
+        dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'cross_branch_upgrade_to_version_2_0_2_input')
+        import db_migrator
+        dbmgtr = db_migrator.DBMigrator(None)
+        dbmgtr.migrate()
+        dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'cross_branch_upgrade_to_version_2_0_2_expected')
+        expected_db = Db()
+
+        expected_db
+        new_tables = ["RESTAPI", "TELEMETRY", "CONSOLE_SWITCH"]
+        for table in new_tables:
+            resulting_table = dbmgtr.configDB.get_table(table)
+            expected_table = expected_db.cfgdb.get_table(table)
+            diff = DeepDiff(resulting_table, expected_table, ignore_order=True)
+            assert not diff