diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/context_config.json b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/context_config.json
new file mode 100644
index 00000000000..9f9f80ba0d3
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/context_config.json
@@ -0,0 +1,32 @@
+{
+    "CONTEXTS": [
+        {
+            "guid" : 0,
+            "name" : "sw0",
+            "dbAsic" : "ASIC_DB",
+            "dbCounters" : "COUNTERS_DB",
+            "dbFlex": "FLEX_COUNTER_DB",
+            "dbState" : "STATE_DB",
+            "switches": [
+                {
+                    "index" : 0,
+                    "hwinfo" : ""
+                }
+            ]
+        },
+        {
+            "guid" : 1,
+            "name" : "phy1",
+            "dbAsic" : "GB_ASIC_DB",
+            "dbCounters" : "GB_COUNTERS_DB",
+            "dbFlex": "GB_FLEX_COUNTER_DB",
+            "dbState" : "STATE_DB",
+            "switches": [
+                {
+                    "index" : 1,
+                    "hwinfo" : ""
+                }
+            ]
+        }
+    ]
+}
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/gearbox_config.json b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/gearbox_config.json
new file mode 100644
index 00000000000..629bc600875
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/gearbox_config.json
@@ -0,0 +1,38 @@
+{
+  "phys": [
+    {
+      "phy_id": 1,
+      "name": "sesto-1",
+      "address": "0x1000",
+      "lib_name": "libsai_phy_sesto-1.so",
+      "firmware_path": "/tmp/phy-sesto-1.bin",
+      "config_file": "/usr/share/sonic/hwsku/phy1_config_1.json",
+      "sai_init_config_file": "/usr/share/sonic/hwsku/sesto-1.bcm",
+      "phy_access": "mdio",
+      "bus_id": 0
+    }
+  ],
+  "interfaces": [
+    {
+      "name": "Ethernet0",
+      "index": 0,
+      "phy_id" : 1,
+      "system_lanes": [200,201],
+      "line_lanes": [206]
+    },
+    {
+      "name": "Ethernet4",
+      "index": 1,
+      "phy_id" : 1,
+      "system_lanes": [202,203],
+      "line_lanes": [207]
+    },
+    {
+      "name": "Ethernet8",
+      "index": 2,
+      "phy_id" : 1,
+      "system_lanes": [204,205],
+      "line_lanes": [208]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/phy1_config_1.json b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/phy1_config_1.json
new file mode 100644
index 00000000000..691acd9f9b8
--- /dev/null
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/phy1_config_1.json
@@ -0,0 +1,168 @@
+{
+  "lanes": [
+    {
+      "index": 200,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0200"   
+    },
+    {
+      "index": 201,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0201"
+    },
+    {
+      "index": 202,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0202"
+    },
+    {
+      "index": 203,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0203"
+    },
+    {
+      "index": 204,
+      "local_lane_id": 0,
+      "system_side": false,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 200,
+      "mdio_addr": "0x0204"
+    },
+    {
+      "index": 205,
+      "local_lane_id": 0,
+      "system_side": false,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 202,
+      "mdio_addr": "0x0205"
+    },
+    {
+      "index": 206,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0206"
+    },
+    {
+      "index": 207,
+      "local_lane_id": 0,
+      "system_side": false,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0207"
+    },
+    {
+      "index": 208,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0208"
+    }
+  ],
+  "ports": [
+    {
+      "index": 0,
+      "mdio_addr": "0x2000",
+      "system_speed": 20000,
+      "system_fec": "none",
+      "system_auto_neg": true,
+      "system_loopback": "none",
+      "system_training": false,
+      "line_speed": 40000,
+      "line_fec": "none",
+      "line_auto_neg": true,
+      "line_media_type": "fiber",
+      "line_intf_type": "none",
+      "line_loopback": "none",
+      "line_training": false,
+      "line_adver_speed": [],
+      "line_adver_fec": [],
+      "line_adver_auto_neg": false,
+      "line_adver_asym_pause": false,
+      "line_adver_media_type": "fiber"
+    },
+    {
+      "index": 1,
+      "mdio_addr": "0x3000",
+      "system_speed": 20000,
+      "system_fec": "none",
+      "system_auto_neg": true,
+      "system_loopback": "none",
+      "system_training": false,
+      "line_speed": 40000,
+      "line_fec": "none",
+      "line_auto_neg": true,
+      "line_media_type": "fiber",
+      "line_intf_type": "none",
+      "line_loopback": "none",
+      "line_training": false,
+      "line_adver_speed": [],
+      "line_adver_fec": [],
+      "line_adver_auto_neg": false,
+      "line_adver_asym_pause": false,
+      "line_adver_media_type": "fiber"
+    },
+    {
+      "index": 2,
+      "mdio_addr": "0x4000",
+      "system_speed": 20000,
+      "system_fec": "none",
+      "system_auto_neg": true,
+      "system_loopback": "none",
+      "system_training": false,
+      "line_speed": 40000,
+      "line_fec": "none",
+      "line_auto_neg": true,
+      "line_media_type": "fiber",
+      "line_intf_type": "none",
+      "line_loopback": "none",
+      "line_training": false,
+      "line_adver_speed": [],
+      "line_adver_fec": [],
+      "line_adver_auto_neg": false,
+      "line_adver_asym_pause": false,
+      "line_adver_media_type": "fiber"
+    }
+  ]
+}
diff --git a/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/context_config.json b/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/context_config.json
new file mode 100644
index 00000000000..9f9f80ba0d3
--- /dev/null
+++ b/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/context_config.json
@@ -0,0 +1,32 @@
+{
+    "CONTEXTS": [
+        {
+            "guid" : 0,
+            "name" : "sw0",
+            "dbAsic" : "ASIC_DB",
+            "dbCounters" : "COUNTERS_DB",
+            "dbFlex": "FLEX_COUNTER_DB",
+            "dbState" : "STATE_DB",
+            "switches": [
+                {
+                    "index" : 0,
+                    "hwinfo" : ""
+                }
+            ]
+        },
+        {
+            "guid" : 1,
+            "name" : "phy1",
+            "dbAsic" : "GB_ASIC_DB",
+            "dbCounters" : "GB_COUNTERS_DB",
+            "dbFlex": "GB_FLEX_COUNTER_DB",
+            "dbState" : "STATE_DB",
+            "switches": [
+                {
+                    "index" : 1,
+                    "hwinfo" : ""
+                }
+            ]
+        }
+    ]
+}
diff --git a/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/gearbox_config.json b/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/gearbox_config.json
new file mode 100644
index 00000000000..6342bd74b89
--- /dev/null
+++ b/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/gearbox_config.json
@@ -0,0 +1,38 @@
+{
+  "phys": [
+    {
+      "phy_id": 1,
+      "name": "sesto-1",
+      "address": "0x1000",
+      "lib_name": "libsai_phy_sesto-1.so",
+      "firmware_path": "/tmp/phy-sesto-1.bin",
+      "config_file": "/usr/share/sonic/hwsku/sesto-1.json",
+      "sai_init_config_file": "/usr/share/sonic/hwsku/sesto-1.bcm",
+      "phy_access": "mdio",
+      "bus_id": 0
+    }
+  ],
+  "interfaces": [
+    {
+      "name": "Ethernet48",
+      "index": 49,
+      "phy_id" : 1,
+      "system_lanes": [200,201,202,203],
+      "line_lanes": [204,205]
+    },
+    {
+      "name": "Ethernet49",
+      "index": 50,
+      "phy_id" : 1,
+      "system_lanes": [206,207,208,209],
+      "line_lanes": [210,211]
+    },
+    {
+      "name": "Ethernet50",
+      "index": 51,
+      "phy_id" : 1,
+      "system_lanes": [212,213,214,215],
+      "line_lanes": [216]
+    }
+  ]
+}
diff --git a/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/sesto-1.json b/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/sesto-1.json
new file mode 100644
index 00000000000..a9c92ba8ebe
--- /dev/null
+++ b/device/dell/x86_64-dellemc_s5248f_c3538-r0/DellEMC-S5248f-P-25G/sesto-1.json
@@ -0,0 +1,256 @@
+{
+  "lanes": [
+    {
+      "index": 200,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0200"   
+    },
+    {
+      "index": 201,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0201"
+    },
+    {
+      "index": 202,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0202"
+    },
+    {
+      "index": 203,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0203"
+    },
+    {
+      "index": 204,
+      "local_lane_id": 0,
+      "system_side": false,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 200,
+      "mdio_addr": "0x0204"
+    },
+    {
+      "index": 205,
+      "local_lane_id": 0,
+      "system_side": false,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 202,
+      "mdio_addr": "0x0205"
+    },
+    {
+      "index": 206,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0206"
+    },
+    {
+      "index": 207,
+      "local_lane_id": 0,
+      "system_side": false,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0207"
+    },
+    {
+      "index": 208,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0208"
+    },
+    {
+      "index": 209,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0209"
+    },
+    {
+      "index": 210,
+      "local_lane_id": 0,
+      "system_side": false,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 206,
+      "mdio_addr": "0x0210"
+    },
+    {
+      "index": 211,
+      "local_lane_id": 0,
+      "system_side": false,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 208,
+      "mdio_addr": "0x0211"
+    },
+    {
+      "index": 212,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0012"
+    },
+    {
+      "index": 213,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0013"
+    },
+    {
+      "index": 214,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0014"
+    },
+    {
+      "index": 215,
+      "local_lane_id": 0,
+      "system_side": true,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 0,
+      "mdio_addr": "0x0015"
+    },
+    {
+      "index": 216,
+      "local_lane_id": 0,
+      "system_side": false,
+      "tx_polarity": 0,
+      "rx_polarity": 0,
+      "line_tx_lanemap": 0,
+      "line_rx_lanemap": 0,
+      "line_to_system_lanemap": 212,
+      "mdio_addr": "0x0016"
+    }
+  ],
+  "ports": [
+    {
+      "index": 49,
+      "mdio_addr": "0x2000",
+      "system_speed": 25000,
+      "system_fec": "none",
+      "system_auto_neg": true,
+      "system_loopback": "none",
+      "system_training": false,
+      "line_speed": 50000,
+      "line_fec": "none",
+      "line_auto_neg": true,
+      "line_media_type": "fiber",
+      "line_intf_type": "none",
+      "line_loopback": "none",
+      "line_training": false,
+      "line_adver_speed": [],
+      "line_adver_fec": [],
+      "line_adver_auto_neg": false,
+      "line_adver_asym_pause": false,
+      "line_adver_media_type": "fiber"
+    },
+    {
+      "index": 50,
+      "mdio_addr": "0x3000",
+      "system_speed": 25000,
+      "system_fec": "none",
+      "system_auto_neg": true,
+      "system_loopback": "none",
+      "system_training": false,
+      "line_speed": 50000,
+      "line_fec": "none",
+      "line_auto_neg": true,
+      "line_media_type": "fiber",
+      "line_intf_type": "none",
+      "line_loopback": "none",
+      "line_training": false,
+      "line_adver_speed": [],
+      "line_adver_fec": [],
+      "line_adver_auto_neg": false,
+      "line_adver_asym_pause": false,
+      "line_adver_media_type": "fiber"
+    },
+    {
+      "index": 51,
+      "mdio_addr": "0x4000",
+      "system_speed": 25000,
+      "system_fec": "none",
+      "system_auto_neg": true,
+      "system_loopback": "none",
+      "system_training": false,
+      "line_speed": 100000,
+      "line_fec": "none",
+      "line_auto_neg": true,
+      "line_media_type": "fiber",
+      "line_intf_type": "none",
+      "line_loopback": "none",
+      "line_training": false,
+      "line_adver_speed": [],
+      "line_adver_fec": [],
+      "line_adver_auto_neg": false,
+      "line_adver_asym_pause": false,
+      "line_adver_media_type": "fiber"
+    }
+  ]
+}
diff --git a/dockers/docker-database/database_config.json.j2 b/dockers/docker-database/database_config.json.j2
index 3383ec16114..c7e8a0d242d 100644
--- a/dockers/docker-database/database_config.json.j2
+++ b/dockers/docker-database/database_config.json.j2
@@ -52,6 +52,21 @@
             "id" : 7,
             "separator": "|",
             "instance" : "redis"
+        },
+        "GB_ASIC_DB" : {
+            "id" : 8,
+            "separator": "|",
+            "instance" : "redis"
+        },
+        "GB_COUNTERS_DB" : {
+            "id" : 9,
+            "separator": "|",
+            "instance" : "redis"
+        },
+        "GB_FLEX_COUNTER_DB" : {
+            "id" : 10,
+            "separator": "|",
+            "instance" : "redis"
         }
     },
     "VERSION" : "1.0"
diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
index 3cd192f24ce..c290ab8a4d9 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -70,6 +70,15 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=orchagent:running
 
+[program:gearsyncd]
+command=/usr/bin/gearsyncd -p /usr/share/sonic/hwsku/gearbox_config.json
+priority=4
+autostart=false
+autorestart=unexpected
+startretries=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+
 [program:neighsyncd]
 command=/usr/bin/neighsyncd
 priority=7
diff --git a/dockers/docker-orchagent/supervisord.conf.orig b/dockers/docker-orchagent/supervisord.conf.orig
new file mode 100644
index 00000000000..cefbce98c64
--- /dev/null
+++ b/dockers/docker-orchagent/supervisord.conf.orig
@@ -0,0 +1,161 @@
+[supervisord]
+logfile_maxbytes=1MB
+logfile_backups=2
+nodaemon=true
+
+[eventlistener:dependent-startup]
+command=python -m supervisord_dependent_startup
+autostart=true
+autorestart=unexpected
+startretries=0
+exitcodes=0,3
+events=PROCESS_STATE
+
+[eventlistener:supervisor-proc-exit-listener]
+command=/usr/bin/supervisor-proc-exit-listener --container-name swss
+events=PROCESS_STATE_EXITED
+autostart=true
+autorestart=unexpected
+
+[program:rsyslogd]
+command=/usr/sbin/rsyslogd -n -iNONE
+priority=1
+autostart=false
+autorestart=unexpected
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+
+[program:orchagent]
+command=/usr/bin/orchagent.sh
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
+
+[program:restore_neighbors]
+command=/usr/bin/restore_neighbors.py
+priority=4
+autostart=false
+autorestart=false
+startsecs=0
+startretries=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=orchagent:running
+
+[program:swssconfig]
+command=/usr/bin/swssconfig.sh
+priority=6
+autostart=false
+autorestart=unexpected
+startretries=0
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=orchagent:running
+
+[program:portsyncd]
+command=/usr/bin/portsyncd
+priority=4
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited
+
+[program:neighsyncd]
+command=/usr/bin/neighsyncd
+priority=5
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited
+
+[program:vlanmgrd]
+command=/usr/bin/vlanmgrd
+priority=8
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited
+
+[program:intfmgrd]
+command=/usr/bin/intfmgrd
+priority=9
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited
+
+[program:portmgrd]
+command=/usr/bin/portmgrd
+priority=10
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited
+
+[program:buffermgrd]
+command=/usr/bin/buffermgrd -l /usr/share/sonic/hwsku/pg_profile_lookup.ini
+priority=11
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited
+
+[program:vrfmgrd]
+command=/usr/bin/vrfmgrd
+priority=13
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited
+
+[program:nbrmgrd]
+command=/usr/bin/nbrmgrd
+priority=15
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited
+
+[program:vxlanmgrd]
+command=/usr/bin/vxlanmgrd
+priority=16
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited
+
+[program:enable_counters]
+command=/usr/bin/enable_counters.py
+priority=12
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=swssconfig:exited
diff --git a/files/build_templates/physyncd.service.j2 b/files/build_templates/physyncd.service.j2
new file mode 100644
index 00000000000..d5b3d7d3e12
--- /dev/null
+++ b/files/build_templates/physyncd.service.j2
@@ -0,0 +1,31 @@
+[Unit]
+Description=physyncd service
+Requires=database.service updategraph.service
+{% if sonic_asic_platform == 'broadcom' %}
+Requires=opennsl-modules.service
+ConditionPathExists=!/usr/share/sonic/hwsku/gearbox_config.json
+{% elif sonic_asic_platform == 'nephos' %}
+Requires=nps-modules-4.9.0-9-2-amd64.service
+{% endif %}
+After=database.service updategraph.service
+After=interfaces-config.service
+{% if sonic_asic_platform == 'broadcom' %}
+After=opennsl-modules.service
+{% elif sonic_asic_platform == 'nephos' %}
+After=nps-modules-4.9.0-9-2-amd64.service
+{% endif %}
+After=swss.service
+Before=ntp-config.service
+
+[Service]
+User=root
+Environment=sonic_asic_platform={{ sonic_asic_platform }}
+ExecStartPre=/usr/local/bin/physyncd.sh start
+ExecStart=/usr/local/bin/physyncd.sh wait
+ExecStop=/usr/local/bin/physyncd.sh stop
+{% if sonic_asic_platform == 'mellanox' %}
+TimeoutStartSec=150
+{% endif %}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 635084fd541..bc7d1d4446c 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -505,9 +505,10 @@ sudo LANG=C chroot $FILESYSTEM_ROOT fuser -km /sys || true
 sudo LANG=C chroot $FILESYSTEM_ROOT umount -lf /sys
 {% endif %}
 
-# Copy swss and syncd service script
+# Copy swss syncd, and physyncd service scripts
 sudo LANG=C cp $SCRIPTS_DIR/swss.sh $FILESYSTEM_ROOT/usr/local/bin/swss.sh
 sudo LANG=C cp $SCRIPTS_DIR/syncd.sh $FILESYSTEM_ROOT/usr/local/bin/syncd.sh
+sudo LANG=C cp $SCRIPTS_DIR/physyncd.sh $FILESYSTEM_ROOT/usr/local/bin/physyncd.sh
 
 # Copy sonic-netns-exec script
 sudo LANG=C cp $SCRIPTS_DIR/sonic-netns-exec $FILESYSTEM_ROOT/usr/bin/sonic-netns-exec
diff --git a/files/build_templates/sonic_debian_extension.j2.orig b/files/build_templates/sonic_debian_extension.j2.orig
new file mode 100644
index 00000000000..2488da1c206
--- /dev/null
+++ b/files/build_templates/sonic_debian_extension.j2.orig
@@ -0,0 +1,561 @@
+#!/bin/bash
+## This script is to automate loading of vendor specific docker images
+## and instalation of configuration files and vendor specific packages
+## to debian file system.
+##
+## USAGE:
+##   ./sonic_debian_extension.sh FILESYSTEM_ROOT PLATFORM_DIR
+## PARAMETERS:
+##   FILESYSTEM_ROOT
+##          Path to debian file system root directory
+
+FILESYSTEM_ROOT=$1
+[ -n "$FILESYSTEM_ROOT" ] || {
+    echo "Error: no or empty FILESYSTEM_ROOT argument"
+    exit 1
+}
+
+PLATFORM_DIR=$2
+[ -n "$PLATFORM_DIR" ] || {
+    echo "Error: no or empty PLATFORM_DIR argument"
+    exit 1
+}
+
+## Enable debug output for script
+set -x -e
+
+CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
+
+. functions.sh
+BUILD_TEMPLATES=files/build_templates
+IMAGE_CONFIGS=files/image_config
+SCRIPTS_DIR=files/scripts
+
+# Define target fold macro
+FILESYSTEM_ROOT_USR="$FILESYSTEM_ROOT/usr"
+FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM="$FILESYSTEM_ROOT/usr/lib/systemd/system"
+FILESYSTEM_ROOT_USR_SHARE="$FILESYSTEM_ROOT_USR/share"
+FILESYSTEM_ROOT_USR_SHARE_SONIC="$FILESYSTEM_ROOT_USR_SHARE/sonic"
+FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES="$FILESYSTEM_ROOT_USR_SHARE_SONIC/templates"
+FILESYSTEM_ROOT_ETC="$FILESYSTEM_ROOT/etc"
+FILESYSTEM_ROOT_ETC_SONIC="$FILESYSTEM_ROOT_ETC/sonic"
+
+GENERATED_SERVICE_FILE="$FILESYSTEM_ROOT/etc/sonic/generated_services.conf"
+
+clean_sys() {
+    sudo chroot $FILESYSTEM_ROOT umount /sys/fs/cgroup/*            \
+                                        /sys/fs/cgroup              \
+                                        /sys || true
+}
+trap_push clean_sys
+sudo LANG=C chroot $FILESYSTEM_ROOT mount sysfs /sys -t sysfs
+
+sudo bash -c "echo \"DOCKER_OPTS=\"--storage-driver=overlay2\"\" >> $FILESYSTEM_ROOT/etc/default/docker"
+sudo cp files/docker/docker $FILESYSTEM_ROOT/etc/init.d/
+if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
+    SONIC_NATIVE_DOCKERD_FOR_DOCKERFS=" -H unix:///dockerfs/var/run/docker.sock "
+    SONIC_NATIVE_DOCKERD_FOR_DOCKERFS_PID="cat `pwd`/dockerfs/var/run/docker.pid"
+else
+    sudo chroot $FILESYSTEM_ROOT service docker start
+fi
+
+# Apply apt configuration files
+sudo cp $IMAGE_CONFIGS/apt/sources.list $FILESYSTEM_ROOT/etc/apt/
+sudo mkdir -p $FILESYSTEM_ROOT/etc/apt/sources.list.d/
+sudo cp -R $IMAGE_CONFIGS/apt/sources.list.d/${CONFIGURED_ARCH}/* $FILESYSTEM_ROOT/etc/apt/sources.list.d/
+cat $IMAGE_CONFIGS/apt/sonic-dev.gpg.key | sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add -
+
+# Update apt's snapshot of its repos
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get update
+
+# Apply environtment configuration files
+sudo cp $IMAGE_CONFIGS/environment/environment $FILESYSTEM_ROOT/etc/
+sudo cp $IMAGE_CONFIGS/environment/motd $FILESYSTEM_ROOT/etc/
+
+# Create all needed directories
+sudo mkdir -p $FILESYSTEM_ROOT/etc/sonic/
+sudo mkdir -p $FILESYSTEM_ROOT/etc/modprobe.d/
+sudo mkdir -p $FILESYSTEM_ROOT/var/cache/sonic/
+sudo mkdir -p $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
+# This is needed for Stretch and might not be needed for Buster where Linux create this directory by default. 
+# Keeping it generic. It should not harm anyways.
+sudo mkdir -p $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+
+# Install a more recent version of ifupdown2  (and its dependencies via 'apt-get -y install -f')
+sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/ifupdown2_*.deb || \
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+
+# Install ipables  (and its dependencies via 'apt-get -y install -f')
+sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/iptables_*.deb || \
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+
+# Install dependencies for SONiC config engine
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \
+    python-dev     \
+    python-lxml    \
+    python-yaml    \
+    python-bitarray
+
+# Install SONiC config engine Python package
+CONFIG_ENGINE_WHEEL_NAME=$(basename {{config_engine_wheel_path}})
+sudo cp {{config_engine_wheel_path}} $FILESYSTEM_ROOT/$CONFIG_ENGINE_WHEEL_NAME
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install $CONFIG_ENGINE_WHEEL_NAME
+sudo rm -rf $FILESYSTEM_ROOT/$CONFIG_ENGINE_WHEEL_NAME
+
+# Install Python client for Redis
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install "redis==2.10.6"
+
+# Install redis-dump-load Python 3 package
+# Note: the scripts will be overwritten by corresponding Python 2 package
+REDIS_DUMP_LOAD_PY3_WHEEL_NAME=$(basename {{redis_dump_load_py3_wheel_path}})
+sudo cp {{redis_dump_load_py3_wheel_path}} $FILESYSTEM_ROOT/$REDIS_DUMP_LOAD_PY3_WHEEL_NAME
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install $REDIS_DUMP_LOAD_PY3_WHEEL_NAME
+sudo rm -rf $FILESYSTEM_ROOT/$REDIS_DUMP_LOAD_PY3_WHEEL_NAME
+
+# Install redis-dump-load Python 2 package
+REDIS_DUMP_LOAD_PY2_WHEEL_NAME=$(basename {{redis_dump_load_py2_wheel_path}})
+sudo cp {{redis_dump_load_py2_wheel_path}} $FILESYSTEM_ROOT/$REDIS_DUMP_LOAD_PY2_WHEEL_NAME
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install $REDIS_DUMP_LOAD_PY2_WHEEL_NAME
+sudo rm -rf $FILESYSTEM_ROOT/$REDIS_DUMP_LOAD_PY2_WHEEL_NAME
+
+# Install Python module for ipaddress
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install ipaddress
+
+# Install SwSS SDK Python 3 package
+# Note: the scripts will be overwritten by corresponding Python 2 package
+if [ -e {{swsssdk_py3_wheel_path}} ]; then
+    SWSSSDK_PY3_WHEEL_NAME=$(basename {{swsssdk_py3_wheel_path}})
+    sudo cp {{swsssdk_py3_wheel_path}} $FILESYSTEM_ROOT/$SWSSSDK_PY3_WHEEL_NAME
+    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install $SWSSSDK_PY3_WHEEL_NAME
+    sudo rm -rf $FILESYSTEM_ROOT/$SWSSSDK_PY3_WHEEL_NAME
+fi
+
+# Install SwSS SDK Python 2 package
+SWSSSDK_PY2_WHEEL_NAME=$(basename {{swsssdk_py2_wheel_path}})
+sudo cp {{swsssdk_py2_wheel_path}} $FILESYSTEM_ROOT/$SWSSSDK_PY2_WHEEL_NAME
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install $SWSSSDK_PY2_WHEEL_NAME
+sudo rm -rf $FILESYSTEM_ROOT/$SWSSSDK_PY2_WHEEL_NAME
+
+# Install sonic-yang-models py3 package, install dependencies
+sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/libyang_*.deb
+sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/libyang-cpp_*.deb
+sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/python2-yang_*.deb
+SONIC_YANG_MODEL_PY3_WHEEL_NAME=$(basename {{sonic_yang_models_py3_wheel_path}})
+sudo cp {{sonic_yang_models_py3_wheel_path}} $FILESYSTEM_ROOT/$SONIC_YANG_MODEL_PY3_WHEEL_NAME
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install $SONIC_YANG_MODEL_PY3_WHEEL_NAME
+sudo rm -rf $FILESYSTEM_ROOT/$SONIC_YANG_MODEL_PY3_WHEEL_NAME
+# Install sonic-yang-mgmt Python package
+SONIC_YANG_MGMT_PY_WHEEL_NAME=$(basename {{sonic_yang_mgmt_py_wheel_path}})
+sudo cp {{sonic_yang_mgmt_py_wheel_path}} $FILESYSTEM_ROOT/$SONIC_YANG_MGMT_PY_WHEEL_NAME
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install $SONIC_YANG_MGMT_PY_WHEEL_NAME
+sudo rm -rf $FILESYSTEM_ROOT/$SONIC_YANG_MGMT_PY_WHEEL_NAME
+
+# Install sonic-platform-common Python 2 package
+PLATFORM_COMMON_PY2_WHEEL_NAME=$(basename {{platform_common_py2_wheel_path}})
+sudo cp {{platform_common_py2_wheel_path}} $FILESYSTEM_ROOT/$PLATFORM_COMMON_PY2_WHEEL_NAME
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install $PLATFORM_COMMON_PY2_WHEEL_NAME
+sudo rm -rf $FILESYSTEM_ROOT/$PLATFORM_COMMON_PY2_WHEEL_NAME
+
+# Install sonic-daemon-base Python 2 package
+DAEMON_BASE_PY2_WHEEL_NAME=$(basename {{daemon_base_py2_wheel_path}})
+sudo cp {{daemon_base_py2_wheel_path}} $FILESYSTEM_ROOT/$DAEMON_BASE_PY2_WHEEL_NAME
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install $DAEMON_BASE_PY2_WHEEL_NAME
+sudo rm -rf $FILESYSTEM_ROOT/$DAEMON_BASE_PY2_WHEEL_NAME
+
+# Install built Python Click package (and its dependencies via 'apt-get -y install -f')
+# Do this before installing sonic-utilities so that it doesn't attempt to install
+# an older version as part of its dependencies
+sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/python-click*_all.deb || \
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+
+# Install python pexpect used by sonic-utilities consutil
+# using pip install instead to get a more recent version than is available through debian
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install pexpect
+
+# Install tabulate >= 0.8.1 via pip in order to support multi-line row output for sonic-utilities
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install tabulate==0.8.2
+
+# Install SONiC Utilities (and its dependencies via 'apt-get -y install -f')
+sudo dpkg --root=$FILESYSTEM_ROOT -i $python_debs_path/python-sonic-utilities_*.deb || \
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+
+{% if enable_ztp == "y" %}
+# Install ZTP (and its dependencies via 'apt-get -y install -f')
+sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/sonic-ztp_*.deb || \
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+{% endif %}
+
+# SONiC utilities installs bash-completion as a dependency. However, it is disabled by default
+# in bash.bashrc, so we copy a version of the file with it enabled here.
+sudo cp -f $IMAGE_CONFIGS/bash/bash.bashrc $FILESYSTEM_ROOT/etc/
+
+# Install SONiC Device Data  (and its dependencies via 'apt-get -y install -f')
+sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/sonic-device-data_*.deb || \
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+
+# Install pam-tacplus and nss-tacplus
+sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/libtac2_*.deb || \
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/libpam-tacplus_*.deb || \
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/libnss-tacplus_*.deb || \
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+# Disable tacplus by default
+sudo LANG=C chroot $FILESYSTEM_ROOT pam-auth-update --remove tacplus
+sudo sed -i -e '/^passwd/s/ tacplus//' $FILESYSTEM_ROOT/etc/nsswitch.conf
+
+# Install a custom version of kdump-tools  (and its dependencies via 'apt-get -y install -f')
+if [[ $CONFIGURED_ARCH == amd64 ]]; then
+sudo DEBIAN_FRONTEND=noninteractive dpkg --root=$FILESYSTEM_ROOT -i $debs_path/kdump-tools_*.deb || \
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true chroot $FILESYSTEM_ROOT apt-get -q --no-install-suggests --no-install-recommends --force-no install
+fi
+
+# Install custom-built monit package and SONiC configuration files
+sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/monit_*.deb || \
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+sudo cp $IMAGE_CONFIGS/monit/monitrc $FILESYSTEM_ROOT/etc/monit/
+sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/monitrc
+sudo cp $IMAGE_CONFIGS/monit/conf.d/* $FILESYSTEM_ROOT/etc/monit/conf.d/
+sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/conf.d/*
+
+# Copy crontabs
+sudo cp -f $IMAGE_CONFIGS/cron.d/* $FILESYSTEM_ROOT/etc/cron.d/
+
+# Copy NTP configuration files and templates
+sudo cp $IMAGE_CONFIGS/ntp/ntp-config.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+echo "ntp-config.service" | sudo tee -a $GENERATED_SERVICE_FILE
+sudo cp $IMAGE_CONFIGS/ntp/ntp-config.sh $FILESYSTEM_ROOT/usr/bin/
+sudo cp $IMAGE_CONFIGS/ntp/ntp.conf.j2 $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
+
+# Copy warmboot-finalizer files
+sudo LANG=C cp $IMAGE_CONFIGS/warmboot-finalizer/finalize-warmboot.sh $FILESYSTEM_ROOT/usr/local/bin/finalize-warmboot.sh
+sudo LANG=C cp $IMAGE_CONFIGS/warmboot-finalizer/warmboot-finalizer.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+echo "warmboot-finalizer.service" | sudo tee -a $GENERATED_SERVICE_FILE
+
+# Copy rsyslog configuration files and templates
+sudo cp $IMAGE_CONFIGS/rsyslog/rsyslog-config.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+sudo cp $IMAGE_CONFIGS/rsyslog/rsyslog-config.sh $FILESYSTEM_ROOT/usr/bin/
+sudo cp $IMAGE_CONFIGS/rsyslog/rsyslog.conf.j2 $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
+sudo cp $IMAGE_CONFIGS/rsyslog/rsyslog.d/* $FILESYSTEM_ROOT/etc/rsyslog.d/
+echo "rsyslog-config.service" | sudo tee -a $GENERATED_SERVICE_FILE
+
+# Copy syslog override files
+sudo mkdir -p $FILESYSTEM_ROOT/etc/systemd/system/syslog.socket.d
+sudo cp $IMAGE_CONFIGS/syslog/override.conf $FILESYSTEM_ROOT/etc/systemd/system/syslog.socket.d/override.conf
+sudo cp $IMAGE_CONFIGS/syslog/host_umount.sh $FILESYSTEM_ROOT/usr/bin/
+
+# Copy logrotate.d configuration files
+sudo cp -f $IMAGE_CONFIGS/logrotate/logrotate.d/* $FILESYSTEM_ROOT/etc/logrotate.d/
+
+# Copy systemd-journald configuration files
+sudo cp -f $IMAGE_CONFIGS/systemd/journald.conf $FILESYSTEM_ROOT/etc/systemd/
+
+# Copy interfaces configuration files and templates
+sudo cp $IMAGE_CONFIGS/interfaces/interfaces-config.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+sudo cp $IMAGE_CONFIGS/interfaces/interfaces-config.sh $FILESYSTEM_ROOT/usr/bin/
+sudo cp $IMAGE_CONFIGS/interfaces/*.j2 $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
+echo "interfaces-config.service" | sudo tee -a $GENERATED_SERVICE_FILE
+
+# Copy dhcp client configuration template and create an initial configuration
+sudo cp files/dhcp/dhclient.conf.j2 $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
+j2 files/dhcp/dhclient.conf.j2 | sudo tee $FILESYSTEM_ROOT/etc/dhcp/dhclient.conf
+sudo cp files/dhcp/ifupdown2_policy.json $FILESYSTEM_ROOT/etc/network/ifupdown2/policy.d
+sudo cp files/dhcp/90-dhcp6-systcl.conf.j2 $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
+
+# Copy initial interfaces configuration file, will be overwritten on first boot
+sudo cp $IMAGE_CONFIGS/interfaces/init_interfaces $FILESYSTEM_ROOT/etc/network/interfaces
+sudo mkdir -p $FILESYSTEM_ROOT/etc/network/interfaces.d
+
+# Copy hostcfgd files
+sudo cp $IMAGE_CONFIGS/hostcfgd/hostcfgd.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+echo "hostcfgd.service" | sudo tee -a $GENERATED_SERVICE_FILE
+sudo cp $IMAGE_CONFIGS/hostcfgd/hostcfgd $FILESYSTEM_ROOT/usr/bin/
+sudo cp $IMAGE_CONFIGS/hostcfgd/*.j2 $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
+
+# copy core file uploader files
+sudo cp $IMAGE_CONFIGS/corefile_uploader/core_uploader.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl disable core_uploader.service
+sudo cp $IMAGE_CONFIGS/corefile_uploader/core_uploader.py $FILESYSTEM_ROOT/usr/bin/
+sudo cp $IMAGE_CONFIGS/corefile_uploader/core_analyzer.rc.json $FILESYSTEM_ROOT_ETC_SONIC/
+sudo chmod og-rw $FILESYSTEM_ROOT_ETC_SONIC/core_analyzer.rc.json
+
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install libffi-dev libssl-dev
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install azure-storage==0.36.0
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install watchdog==0.10.2
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install futures==3.3.0
+
+{% if install_kubernetes == "y" %}
+# Copy kubelet service files
+# Keep it disabled until join, else it continuously restart and as well spew too many
+# non-required log lines wasting syslog resources.
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl disable kubelet.service
+{% endif %}
+
+# Copy the buffer configuration template
+sudo cp $BUILD_TEMPLATES/buffers_config.j2 $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
+
+# Copy the qos configuration template
+sudo cp $BUILD_TEMPLATES/qos_config.j2 $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/
+
+# Copy hostname configuration scripts
+sudo cp $IMAGE_CONFIGS/hostname/hostname-config.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+echo "hostname-config.service" | sudo tee -a $GENERATED_SERVICE_FILE
+sudo cp $IMAGE_CONFIGS/hostname/hostname-config.sh $FILESYSTEM_ROOT/usr/bin/
+
+# Copy miscellaneous scripts
+sudo cp $IMAGE_CONFIGS/misc/docker-wait-any $FILESYSTEM_ROOT/usr/bin/
+
+# Copy internal topology configuration scripts
+{%- if sonic_asic_platform == "vs" %}
+sudo cp $IMAGE_CONFIGS/topology/topology.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+echo "topology.service" | sudo tee -a $GENERATED_SERVICE_FILE
+sudo cp $IMAGE_CONFIGS/topology/topology.sh $FILESYSTEM_ROOT/usr/bin
+{%- endif %}
+
+# Copy updategraph script and service file
+j2 files/build_templates/updategraph.service.j2 | sudo tee $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM/updategraph.service
+sudo cp $IMAGE_CONFIGS/updategraph/updategraph $FILESYSTEM_ROOT/usr/bin/
+echo "updategraph.service" | sudo tee -a $GENERATED_SERVICE_FILE
+{% if enable_dhcp_graph_service == "y" %}
+sudo bash -c "echo enabled=true > $FILESYSTEM_ROOT/etc/sonic/updategraph.conf"
+sudo bash -c "echo src=dhcp >> $FILESYSTEM_ROOT/etc/sonic/updategraph.conf"
+sudo bash -c "echo dhcp_as_static=true >> $FILESYSTEM_ROOT/etc/sonic/updategraph.conf"
+{% else %}
+sudo bash -c "echo enabled=false > $FILESYSTEM_ROOT/etc/sonic/updategraph.conf"
+{% endif %}
+
+# Generate initial SONiC configuration file
+j2 files/build_templates/init_cfg.json.j2 | sudo tee $FILESYSTEM_ROOT/etc/sonic/init_cfg.json
+
+# Copy config-setup script and service file
+j2 files/build_templates/config-setup.service.j2 | sudo tee $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM/config-setup.service
+sudo cp $IMAGE_CONFIGS/config-setup/config-setup $FILESYSTEM_ROOT/usr/bin/config-setup
+echo "config-setup.service" | sudo tee -a $GENERATED_SERVICE_FILE
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable config-setup.service
+
+# Copy SNMP configuration files
+sudo cp $IMAGE_CONFIGS/snmp/snmp.yml $FILESYSTEM_ROOT/etc/sonic/
+
+# Copy ASN configuration files
+sudo cp $IMAGE_CONFIGS/constants/constants.yml $FILESYSTEM_ROOT/etc/sonic/
+
+# Copy sudoers configuration file
+sudo cp $IMAGE_CONFIGS/sudoers/sudoers $FILESYSTEM_ROOT/etc/
+sudo cp $IMAGE_CONFIGS/sudoers/sudoers.lecture $FILESYSTEM_ROOT/etc/
+
+# Copy control plane ACL management daemon files
+sudo cp $IMAGE_CONFIGS/caclmgrd/caclmgrd.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+echo "caclmgrd.service" | sudo tee -a $GENERATED_SERVICE_FILE
+sudo cp $IMAGE_CONFIGS/caclmgrd/caclmgrd $FILESYSTEM_ROOT/usr/bin/
+
+# Copy process/docker cpu/memory utilization data export daemon
+sudo cp $IMAGE_CONFIGS/procdockerstatsd/procdockerstatsd.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+echo "procdockerstatsd.service" | sudo tee -a $GENERATED_SERVICE_FILE
+sudo cp $IMAGE_CONFIGS/procdockerstatsd/procdockerstatsd $FILESYSTEM_ROOT/usr/bin/
+
+# Copy systemd timer configuration
+# It implements delayed start of services
+sudo cp $BUILD_TEMPLATES/process-reboot-cause.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable process-reboot-cause.timer
+
+# Copy process-reboot-cause service files
+sudo cp $IMAGE_CONFIGS/process-reboot-cause/process-reboot-cause.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+echo "process-reboot-cause.service" | sudo tee -a $GENERATED_SERVICE_FILE
+sudo cp $IMAGE_CONFIGS/process-reboot-cause/process-reboot-cause $FILESYSTEM_ROOT/usr/bin/
+
+## Install package without starting service
+## ref: https://wiki.debian.org/chroot
+sudo tee -a $FILESYSTEM_ROOT/usr/sbin/policy-rc.d > /dev/null <<EOF
+#!/bin/sh
+exit 101
+EOF
+sudo chmod a+x $FILESYSTEM_ROOT/usr/sbin/policy-rc.d
+
+{% if installer_debs.strip() -%}
+{% for deb in installer_debs.strip().split(' ') -%}
+{% if sonic_asic_platform == "mellanox" %}
+if [ -e tmpdir ] ;
+then
+    rm -rf tmpdir;
+fi
+sudo mkdir tmpdir
+sudo dpkg --extract {{deb}} tmpdir
+for subdir in $(ls tmpdir) ; do sudo cp -R tmpdir/$subdir/* $FILESYSTEM_ROOT/$subdir; done
+sudo rm -rf tmpdir
+{% else %}
+sudo dpkg --root=$FILESYSTEM_ROOT -i {{deb}} || sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+{% endif %}
+{% endfor %}
+{% endif %}
+
+## Run depmod command for target kernel modules
+sudo LANG=C chroot $FILESYSTEM_ROOT depmod -a {{kversion}}
+
+## download all dependency packages for platform debian packages
+{% if lazy_installer_debs.strip() -%}
+{% for file in lazy_installer_debs.strip().split(' ') -%}
+
+{% set dev = file.split('@')[0] -%}
+{% set deb = file.split('@')[1] -%}
+{% set debfilename = deb.split('/')|last -%}
+{% set debname = debfilename.split('_')|first -%}
+
+sudo dpkg --root=$FILESYSTEM_ROOT -i {{deb}} || sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f --download-only
+
+sudo mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}
+sudo cp {{ deb }} $FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}/
+for f in $(find $FILESYSTEM_ROOT/var/cache/apt/archives -name "*.deb"); do
+    sudo mv $f $FILESYSTEM_ROOT/$PLATFORM_DIR/{{dev}}/
+done
+
+sudo dpkg --root=$FILESYSTEM_ROOT -P {{ debname }}
+
+{% endfor %}
+{% endif %}
+
+sudo rm -f $FILESYSTEM_ROOT/usr/sbin/policy-rc.d
+
+# Copy fstrim service and timer file, enable fstrim timer
+sudo cp $IMAGE_CONFIGS/fstrim/* $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable fstrim.timer
+
+## copy platform rc.local
+sudo cp $IMAGE_CONFIGS/platform/rc.local $FILESYSTEM_ROOT/etc/
+
+## copy blacklist file
+sudo cp $IMAGE_CONFIGS/platform/linux_kernel_bde.conf $FILESYSTEM_ROOT/etc/modprobe.d/
+
+# Enable psample drivers to support sFlow on vs
+{% if sonic_asic_platform == "vs" %}
+sudo tee -a $FILESYSTEM_ROOT/etc/modules-load.d/modules.conf > /dev/null <<EOF
+psample
+act_sample
+EOF
+{% endif %}
+
+## Bind docker path
+if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
+    sudo mkdir -p $FILESYSTEM_ROOT/dockerfs
+    sudo mount --bind dockerfs $FILESYSTEM_ROOT/dockerfs
+fi
+
+{% if installer_images.strip() -%}
+clean_proc() {
+    sudo umount /proc || true
+}
+trap_push clean_proc
+sudo mount proc /proc -t proc
+sudo mkdir $FILESYSTEM_ROOT/target
+sudo mount --bind target $FILESYSTEM_ROOT/target
+sudo chroot $FILESYSTEM_ROOT docker $SONIC_NATIVE_DOCKERD_FOR_DOCKERFS info
+{% for image in installer_images.strip().split(' ') -%}
+{% set imagefilename = image.split('/')|last -%}
+{% set imagename = imagefilename.split('.')|first -%}
+sudo LANG=C chroot $FILESYSTEM_ROOT docker $SONIC_NATIVE_DOCKERD_FOR_DOCKERFS load -i {{image}}
+sudo LANG=C chroot $FILESYSTEM_ROOT docker $SONIC_NATIVE_DOCKERD_FOR_DOCKERFS tag {{imagename}}:latest {{imagename}}:$(sonic_get_version)
+{% if imagename.endswith('-dbg') %}
+{% set imagebasename = imagename.replace('-dbg', '') -%}
+sudo LANG=C chroot $FILESYSTEM_ROOT docker $SONIC_NATIVE_DOCKERD_FOR_DOCKERFS tag {{imagename}}:latest {{imagebasename}}:$(sonic_get_version)
+sudo LANG=C chroot $FILESYSTEM_ROOT docker $SONIC_NATIVE_DOCKERD_FOR_DOCKERFS tag {{imagename}}:latest {{imagebasename}}:latest
+{% endif %}
+{% endfor %}
+
+{% if install_kubernetes == "y" %}
+## Pull in kubernetes docker images
+echo "pulling universal k8s images ..."
+FLANNEL_ARCH=$([ "${CONFIGURED_ARCH}" == "armhf" ] && echo "arm64" || echo "${CONFIGURED_ARCH}")
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT docker pull k8s.gcr.io/pause:${K8s_GCR_IO_PAUSE_VERSION}
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT docker pull k8s.gcr.io/kube-proxy:v${KUBERNETES_VERSION}
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT docker pull quay.io/coreos/flannel:${K8s_CNI_FLANNEL_VERSION}-${FLANNEL_ARCH}
+echo "docker images pull complete"
+{% endif %}
+
+sudo umount $FILESYSTEM_ROOT/target
+sudo rm -r $FILESYSTEM_ROOT/target
+if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
+    sudo umount $FILESYSTEM_ROOT/dockerfs
+    sudo rm -fr $FILESYSTEM_ROOT/dockerfs
+    sudo kill -9 `sudo $SONIC_NATIVE_DOCKERD_FOR_DOCKERFS_PID` || true
+else
+    sudo chroot $FILESYSTEM_ROOT service docker stop
+fi
+sudo umount /proc || true
+sudo rm $FILESYSTEM_ROOT/etc/init.d/docker
+{% for script in installer_start_scripts.split(' ') -%}
+sudo cp {{script}} $FILESYSTEM_ROOT/usr/bin/
+{% endfor %}
+{% for service in installer_services.split(' ') -%}
+if [ -f {{service}} ]; then
+    sudo cp {{service}} $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+
+    {% if "@" in service %}
+    MULTI_INSTANCE="{{service}}"
+    SINGLE_INSTANCE=${MULTI_INSTANCE/"@"}
+    sudo cp $SINGLE_INSTANCE $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+    {% endif %}
+
+    echo "{{service}}" | sudo tee -a $GENERATED_SERVICE_FILE
+fi
+{% endfor %}
+if [ -f iccpd.service ]; then
+    sudo LANG=C chroot $FILESYSTEM_ROOT systemctl disable iccpd.service
+fi
+sudo LANG=C chroot $FILESYSTEM_ROOT fuser -km /sys || true
+sudo LANG=C chroot $FILESYSTEM_ROOT umount -lf /sys
+{% endif %}
+
+# Copy swss and syncd service script
+sudo LANG=C cp $SCRIPTS_DIR/swss.sh $FILESYSTEM_ROOT/usr/local/bin/swss.sh
+sudo LANG=C cp $SCRIPTS_DIR/syncd.sh $FILESYSTEM_ROOT/usr/local/bin/syncd.sh
+
+# Copy sonic-netns-exec script
+sudo LANG=C cp $SCRIPTS_DIR/sonic-netns-exec $FILESYSTEM_ROOT/usr/bin/sonic-netns-exec
+
+# Copy systemd timer configuration
+# It implements delayed start of services
+sudo cp $BUILD_TEMPLATES/snmp.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable snmp.timer
+{% if enable_system_telemetry == 'y' %}
+sudo cp $BUILD_TEMPLATES/telemetry.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable telemetry.timer
+{% endif %}
+
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get purge -y python-dev
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get clean -y
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get autoremove -y
+
+{% for file in installer_extra_files.split(' ') -%}
+{% if file.strip() -%}
+{% set src = file.split(':')[0] -%}
+{% set dst = file.split(':')[1] -%}
+sudo cp {{src}} $FILESYSTEM_ROOT/{{dst}}
+{% endif -%}
+{% endfor -%}
+
+{% if sonic_asic_platform == "mellanox" %}
+sudo mkdir -p $FILESYSTEM_ROOT/etc/mlnx/
+sudo cp $files_path/$MLNX_SPC_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC.mfa
+sudo cp $files_path/$MLNX_SPC2_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC2.mfa
+sudo cp $files_path/$MLNX_SPC3_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC3.mfa
+sudo cp $files_path/$ISSU_VERSION_FILE $FILESYSTEM_ROOT/etc/mlnx/issu-version
+sudo cp $files_path/$MLNX_FFB_SCRIPT $FILESYSTEM_ROOT/usr/bin/mlnx-ffb.sh
+sudo cp $files_path/$MLNX_ONIE_FW_UPDATE $FILESYSTEM_ROOT/usr/bin/$MLNX_ONIE_FW_UPDATE
+sudo cp $files_path/$MLNX_SSD_FW_UPDATE $FILESYSTEM_ROOT/usr/bin/$MLNX_SSD_FW_UPDATE
+j2 platform/mellanox/mlnx-fw-upgrade.j2 | sudo tee $FILESYSTEM_ROOT/usr/bin/mlnx-fw-upgrade.sh
+sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/mlnx-fw-upgrade.sh
+
+# Install mlnx-sonic-platform-common Python 2 package
+MLNX_PLATFORM_COMMON_PY2_WHEEL_NAME=$(basename {{mlnx_platform_api_py2_wheel_path}})
+sudo cp {{mlnx_platform_api_py2_wheel_path}} $FILESYSTEM_ROOT/$MLNX_PLATFORM_COMMON_PY2_WHEEL_NAME
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install $MLNX_PLATFORM_COMMON_PY2_WHEEL_NAME
+sudo rm -rf $FILESYSTEM_ROOT/$MLNX_PLATFORM_COMMON_PY2_WHEEL_NAME
+{% endif %}
+
+{%- if SONIC_ROUTING_STACK == "frr" %}
+sudo mkdir $FILESYSTEM_ROOT/etc/sonic/frr
+sudo touch $FILESYSTEM_ROOT/etc/sonic/frr/frr.conf
+sudo touch $FILESYSTEM_ROOT/etc/sonic/frr/vtysh.conf
+sudo chown -R $FRR_USER_UID:$FRR_USER_GID $FILESYSTEM_ROOT/etc/sonic/frr
+sudo chmod -R 640 $FILESYSTEM_ROOT/etc/sonic/frr/
+sudo chmod 750 $FILESYSTEM_ROOT/etc/sonic/frr
+{%- endif %}
diff --git a/files/scripts/physyncd.sh b/files/scripts/physyncd.sh
new file mode 100644
index 00000000000..e79a4ab6da1
--- /dev/null
+++ b/files/scripts/physyncd.sh
@@ -0,0 +1,191 @@
+#!/bin/bash
+
+SERVICE="physyncd"
+PEER="swss"
+DEBUGLOG="/tmp/swss-physyncd-debug.log"
+LOCKFILE="/tmp/swss-physyncd-lock"
+
+function debug()
+{
+    /usr/bin/logger $1
+    /bin/echo `date` "- $1" >> ${DEBUGLOG}
+}
+
+function lock_service_state_change()
+{
+    debug "Locking ${LOCKFILE} from ${SERVICE} service"
+
+    exec {LOCKFD}>${LOCKFILE}
+    /usr/bin/flock -x ${LOCKFD}
+    trap "/usr/bin/flock -u ${LOCKFD}" 0 2 3 15
+
+    debug "Locked ${LOCKFILE} (${LOCKFD}) from ${SERVICE} service"
+}
+
+function unlock_service_state_change()
+{
+    debug "Unlocking ${LOCKFILE} (${LOCKFD}) from ${SERVICE} service"
+    /usr/bin/flock -u ${LOCKFD}
+}
+
+function check_warm_boot()
+{
+    SYSTEM_WARM_START=`/usr/bin/redis-cli -n 6 hget "WARM_RESTART_ENABLE_TABLE|system" enable`
+    SERVICE_WARM_START=`/usr/bin/redis-cli -n 6 hget "WARM_RESTART_ENABLE_TABLE|${SERVICE}" enable`
+    # SYSTEM_WARM_START could be empty, always make WARM_BOOT meaningful.
+    if [[ x"$SYSTEM_WARM_START" == x"true" ]] || [[ x"$SERVICE_WARM_START" == x"true" ]]; then
+        WARM_BOOT="true"
+    else
+        WARM_BOOT="false"
+    fi
+}
+
+function wait_for_database_service()
+{
+    # Wait for redis server start before database clean
+    until [[ $(/usr/bin/docker exec database redis-cli ping | grep -c PONG) -gt 0 ]];
+        do sleep 1;
+    done
+
+    # Wait for configDB initialization
+    until [[ $(/usr/bin/docker exec database redis-cli -n 4 GET "CONFIG_DB_INITIALIZED") ]];
+        do sleep 1;
+    done
+}
+
+function getBootType()
+{
+    case "$(cat /proc/cmdline | grep -o 'SONIC_BOOT_TYPE=\S*' | cut -d'=' -f2)" in
+    warm*)
+        TYPE='warm'
+        ;;
+    fastfast)
+        TYPE='fastfast'
+        ;;
+    fast*)
+        TYPE='fast'
+        ;;
+    *)
+        TYPE='cold'
+    esac
+    echo "${TYPE}"
+}
+
+start() {
+    debug "Starting ${SERVICE} service..."
+
+    lock_service_state_change
+
+    mkdir -p /host/warmboot
+
+    wait_for_database_service
+    check_warm_boot
+
+    debug "Warm boot flag: ${SERVICE} ${WARM_BOOT}."
+
+    if [[ x"$WARM_BOOT" == x"true" ]]; then
+        # Leave a mark for syncd scripts running inside docker.
+        touch /host/warmboot/warm-starting
+    else
+        rm -f /host/warmboot/warm-starting
+    fi
+
+    # platform specific tasks
+
+    # start mellanox drivers regardless of
+    # boot type
+    if [[ x"$sonic_asic_platform" == x"mellanox" ]]; then
+        BOOT_TYPE=`getBootType`
+        if [[ x"$WARM_BOOT" == x"true" || x"$BOOT_TYPE" == x"fast" ]]; then
+            export FAST_BOOT=1
+        fi
+
+        if [[ x"$WARM_BOOT" != x"true" ]]; then
+            if [[ x"$(/bin/systemctl is-active pmon)" == x"active" ]]; then
+                /bin/systemctl stop pmon
+                /usr/bin/hw-management.sh chipdown
+                /bin/systemctl restart pmon
+            else
+                /usr/bin/hw-management.sh chipdown
+            fi
+        fi
+
+        if [[ x"$BOOT_TYPE" == x"fast" ]]; then
+            /usr/bin/hw-management.sh chipupdis
+        fi
+
+        /usr/bin/mst start
+        /usr/bin/mlnx-fw-upgrade.sh
+        /etc/init.d/sxdkernel start
+    fi
+
+    if [[ x"$WARM_BOOT" != x"true" ]]; then
+        if [ x$sonic_asic_platform == x'cavium' ]; then
+            /etc/init.d/xpnet.sh start
+        fi
+    fi
+
+    # start service docker
+    /usr/bin/${SERVICE}.sh start
+    debug "Started ${SERVICE} service..."
+
+    unlock_service_state_change
+}
+
+wait() {
+    /usr/bin/${SERVICE}.sh wait
+}
+
+stop() {
+    debug "Stopping ${SERVICE} service..."
+
+    lock_service_state_change
+    check_warm_boot
+    debug "Warm boot flag: ${SERVICE} ${WARM_BOOT}."
+
+    if [[ x"$WARM_BOOT" == x"true" ]]; then
+        TYPE=warm
+    else
+        TYPE=cold
+    fi
+
+    if [[ x$sonic_asic_platform != x"mellanox" ]] || [[ x$TYPE != x"cold" ]]; then
+        debug "${TYPE} shutdown physyncd process ..."
+        /usr/bin/docker exec -i physyncd /usr/bin/syncd_request_shutdown --${TYPE}
+
+        # wait until syncd quits gracefully
+        while docker top physyncd | grep -q /usr/bin/physyncd; do
+            sleep 0.1
+        done
+
+        /usr/bin/docker exec -i physyncd /bin/sync
+        debug "Finished ${TYPE} shutdown physyncd process ..."
+    fi
+
+    /usr/bin/${SERVICE}.sh stop
+    debug "Stopped ${SERVICE} service..."
+
+    # platform specific tasks
+
+    if [[ x"$WARM_BOOT" != x"true" ]]; then
+        if [ x$sonic_asic_platform == x'mellanox' ]; then
+            /etc/init.d/sxdkernel stop
+            /usr/bin/mst stop
+        elif [ x$sonic_asic_platform == x'cavium' ]; then
+            /etc/init.d/xpnet.sh stop
+            /etc/init.d/xpnet.sh start
+        fi
+    fi
+
+    unlock_service_state_change
+}
+
+case "$1" in
+    start|wait|stop)
+        $1
+        ;;
+    *)
+        echo "Usage: $0 {start|wait|stop}"
+        exit 1
+        ;;
+esac
diff --git a/platform/template/docker-physyncd-base.mk b/platform/template/docker-physyncd-base.mk
new file mode 100644
index 00000000000..863f3a0b78a
--- /dev/null
+++ b/platform/template/docker-physyncd-base.mk
@@ -0,0 +1,30 @@
+# docker image for physyncd
+
+
+DOCKER_PHYSYNCD_BASE_STEM = docker-physyncd-$(DOCKER_PHYSYNCD_PLATFORM_CODE)
+DOCKER_PHYSYNCD_BASE = $(DOCKER_PHYSYNCD_BASE_STEM).gz
+DOCKER_PHYSYNCD_BASE_DBG = $(DOCKER_PHYSYNCD_BASE_STEM)-$(DBG_IMAGE_MARK).gz
+
+$(DOCKER_PHYSYNCD_BASE)_PATH = $(PLATFORM_PATH)/docker-physyncd-$(DOCKER_PHYSYNCD_PLATFORM_CODE)
+
+$(DOCKER_PHYSYNCD_BASE)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
+
+$(DOCKER_PHYSYNCD_BASE)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
+
+$(DOCKER_PHYSYNCD_BASE)_DBG_DEPENDS += $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS)
+
+$(DOCKER_PHYSYNCD_BASE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)
+
+SONIC_DOCKER_IMAGES += $(DOCKER_PHYSYNCD_BASE)
+SONIC_STRETCH_DOCKERS += $(DOCKER_PHYSYNCD_BASE)
+SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_PHYSYNCD_BASE)
+
+SONIC_DOCKER_DBG_IMAGES += $(DOCKER_PHYSYNCD_BASE_DBG)
+SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_PHYSYNCD_BASE_DBG)
+SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_PHYSYNCD_BASE_DBG)
+
+$(DOCKER_PHYSYNCD_BASE)_CONTAINER_NAME = physyncd
+$(DOCKER_PHYSYNCD_BASE)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_PHYSYNCD_BASE)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
+$(DOCKER_PHYSYNCD_BASE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
+
diff --git a/platform/vs/docker-physyncd-vs.dep b/platform/vs/docker-physyncd-vs.dep
new file mode 100644
index 00000000000..1c640339ee7
--- /dev/null
+++ b/platform/vs/docker-physyncd-vs.dep
@@ -0,0 +1,11 @@
+#DPKG FRK
+DPATH       := $($(DOCKER_PHYSYNCD_BASE)_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/vs/docker-physyncd-vs.mk platform/vs/docker-physyncd-vs.dep   
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(DPATH))
+
+$(DOCKER_PHYSYNCD_BASE)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(DOCKER_PHYSYNCD_BASE)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(DOCKER_PHYSYNCD_BASE)_DEP_FILES   := $(DEP_FILES)
+
+$(eval $(call add_dbg_docker,$(DOCKER_PHYSYNCD_BASE),$(DOCKER_PHYSYNCD_BASE_DBG)))
diff --git a/platform/vs/docker-physyncd-vs.mk b/platform/vs/docker-physyncd-vs.mk
new file mode 100644
index 00000000000..3a5bbf7528b
--- /dev/null
+++ b/platform/vs/docker-physyncd-vs.mk
@@ -0,0 +1,14 @@
+# docker image for vs physyncd
+
+DOCKER_PHYSYNCD_PLATFORM_CODE = vs
+include $(PLATFORM_PATH)/../template/docker-physyncd-base.mk
+
+$(DOCKER_PHYSYNCD_BASE)_DEPENDS += $(SYNCD_VS)
+
+$(DOCKER_PHYSYNCD_BASE)_DBG_DEPENDS += $(SYNCD_VS_DBG) \
+                                $(LIBSWSSCOMMON_DBG) \
+                                $(LIBSAIMETADATA_DBG) \
+                                $(LIBSAIREDIS_DBG) \
+                                $(LIBSAIVS_DBG)
+
+$(DOCKER_PHYSYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
diff --git a/platform/vs/docker-physyncd-vs/Dockerfile.j2 b/platform/vs/docker-physyncd-vs/Dockerfile.j2
new file mode 100644
index 00000000000..4f06b74e903
--- /dev/null
+++ b/platform/vs/docker-physyncd-vs/Dockerfile.j2
@@ -0,0 +1,32 @@
+FROM docker-config-engine-stretch
+
+ARG docker_container_name
+RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
+
+## Make apt-get non-interactive
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update
+
+RUN apt-get install -f -y iproute2=4.20.0-2~bpo9+1 libcap2-bin=1:2.25-1
+
+COPY \
+{% for deb in docker_physyncd_vs_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
+
+RUN dpkg -i \
+{% for deb in docker_physyncd_vs_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor %}
+
+COPY ["start.sh", "/usr/bin/"]
+
+COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
+
+## Clean up
+RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
+RUN rm -rf /debs
+
+ENTRYPOINT ["/usr/bin/supervisord"]
diff --git a/platform/vs/docker-physyncd-vs/start.sh b/platform/vs/docker-physyncd-vs/start.sh
new file mode 100644
index 00000000000..116bc53c7a5
--- /dev/null
+++ b/platform/vs/docker-physyncd-vs/start.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+PLATFORM_DIR=/usr/share/sonic/platform
+HWSKU_DIR=/usr/share/sonic/hwsku
+
+
+# Remove stale files if they exist
+rm -f /var/run/rsyslogd.pid
+
+supervisorctl start rsyslogd
+
+mkdir -p /etc/sai.d/
+
+# Create/Copy the sai.profile to /etc/sai.d/sai.profile
+if [ -f $HWSKU_DIR/pai.profile.j2 ]; then
+    sonic-cfggen -d -t $HWSKU_DIR/pai.profile.j2 > /etc/sai.d/pai.profile
+else
+    if [ -f $HWSKU_DIR/pai.profile ]; then
+        cp $HWSKU_DIR/pai.profile /etc/sai.d/pai.profile
+    fi
+fi
+
+# Create/Copy the gearbox configs to /etc/sai.d/sai.profile
+if [[ x"$sonic_asic_platform" == x"broadcom" ]]; then
+    if [ -d $HWSKU_DIR/gearbox ]; then
+        cp $HWSKU_DIR/gearbox/*.bcm /etc/sai.d/.
+    fi
+fi
+
+supervisorctl start physyncd
+
diff --git a/platform/vs/docker-physyncd-vs/supervisord.conf b/platform/vs/docker-physyncd-vs/supervisord.conf
new file mode 100644
index 00000000000..10d9bc2c606
--- /dev/null
+++ b/platform/vs/docker-physyncd-vs/supervisord.conf
@@ -0,0 +1,28 @@
+[supervisord]
+logfile_maxbytes=1MB
+logfile_backups=2
+nodaemon=true
+
+[program:start.sh]
+command=/usr/bin/start.sh
+priority=1
+autostart=true
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+
+[program:rsyslogd]
+command=/usr/sbin/rsyslogd -n
+priority=2
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+
+[program:physyncd]
+command=/usr/bin/physyncd_start.sh
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
diff --git a/platform/vs/docker-sonic-vs/database_config.json b/platform/vs/docker-sonic-vs/database_config.json
index b86ae11bba9..b65d0e794a8 100644
--- a/platform/vs/docker-sonic-vs/database_config.json
+++ b/platform/vs/docker-sonic-vs/database_config.json
@@ -51,6 +51,21 @@
             "id" : 7,
             "separator": "|",
             "instance" : "redis"
+        },
+        "GB_ASIC_DB" : {
+            "id" : 8,
+            "separator": "|",
+            "instance" : "redis"
+        },
+        "GB_COUNTERS_DB" : {
+            "id" : 9,
+            "separator": "|",
+            "instance" : "redis"
+        },
+        "GB_FLEX_COUNTER_DB" : {
+            "id" : 10,
+            "separator": "|",
+            "instance" : "redis"
         }
     },
     "VERSION" : "1.0"
diff --git a/platform/vs/rules.mk b/platform/vs/rules.mk
old mode 100644
new mode 100755
index d91f487a5ed..c8f83da775e
--- a/platform/vs/rules.mk
+++ b/platform/vs/rules.mk
@@ -2,6 +2,7 @@ include $(PLATFORM_PATH)/syncd-vs.mk
 include $(PLATFORM_PATH)/sonic-version.mk
 include $(PLATFORM_PATH)/docker-sonic-vs.mk
 include $(PLATFORM_PATH)/docker-syncd-vs.mk
+include $(PLATFORM_PATH)/docker-physyncd-vs.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/onie.mk
 include $(PLATFORM_PATH)/kvm-image.mk
diff --git a/src/sonic-device-data/Makefile b/src/sonic-device-data/Makefile
index ecac92b00e0..3de9c27c041 100644
--- a/src/sonic-device-data/Makefile
+++ b/src/sonic-device-data/Makefile
@@ -19,6 +19,9 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 		cp -Lr $$d device/x86_64-kvm_x86_64-r0/ ; \
 		cp ./sai.vs_profile device/x86_64-kvm_x86_64-r0/$$(basename $$d)/sai.profile; \
 		grep -v ^# device/x86_64-kvm_x86_64-r0/$$(basename $$d)/port_config.ini | awk '{i=i+1;print "eth"i":"$$2}' > device/x86_64-kvm_x86_64-r0/$$(basename $$d)/lanemap.ini
+		cp ./pai.vs_profile device/x86_64-kvm_x86_64-r0/$$(basename $$d)/pai.profile; \
+		grep -v ^# device/x86_64-kvm_x86_64-r0/$$(basename $$d)/port_config.ini | awk '{i=i+1;print "eth"i":"$$2}' > device/x86_64-kvm_x86_64-r0/$$(basename $$d)/lanemap.ini
+
 	done;
 
 	# Build the package
diff --git a/src/sonic-device-data/src/pai.vs_profile b/src/sonic-device-data/src/pai.vs_profile
new file mode 100644
index 00000000000..9c99c42a162
--- /dev/null
+++ b/src/sonic-device-data/src/pai.vs_profile
@@ -0,0 +1,7 @@
+SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
+SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
+SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM81724
+SAI_VS_SAI_SWITCH_TYPE=SAI_SWITCH_TYPE_PHY
+SAI_VS_HOSTIF_USE_TAP_DEVICE=false
+SAI_VS_USE_BCMSIM_LINK_MON=true
+SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini