diff --git a/dockers/docker-orchagent/base_image_files/cfgmgr b/dockers/docker-orchagent/base_image_files/cfgmgr
new file mode 100755
index 00000000000..e66f74132ca
--- /dev/null
+++ b/dockers/docker-orchagent/base_image_files/cfgmgr
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker exec -i swss cfgmgr "$@"
\ No newline at end of file
diff --git a/dockers/docker-orchagent/start.sh b/dockers/docker-orchagent/start.sh
index 446b52852f0..24f76036528 100755
--- a/dockers/docker-orchagent/start.sh
+++ b/dockers/docker-orchagent/start.sh
@@ -13,6 +13,8 @@ supervisorctl start rsyslogd
 
 supervisorctl start orchagent
 
+supervisorctl start cfgagentd
+
 supervisorctl start portsyncd
 
 supervisorctl start intfsyncd
diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
index a04238472c4..72e213261df 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -66,3 +66,11 @@ autostart=false
 autorestart=true
 stdout_logfile=syslog
 stderr_logfile=syslog
+
+[program:cfgagentd]
+command=/usr/bin/cfgagentd -d /var/log/swss
+priority=9
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
diff --git a/dockers/docker-teamd/teamd.sh b/dockers/docker-teamd/teamd.sh
index 37b617150a0..f936bd74731 100755
--- a/dockers/docker-teamd/teamd.sh
+++ b/dockers/docker-teamd/teamd.sh
@@ -10,6 +10,7 @@ function start_app {
         done
     fi
     teamsyncd &
+    redis-cli -n 0 HSET LAG_TABLE:ConfigDone admin_status "up"
 }
 
 function clean_up {
@@ -19,6 +20,7 @@ function clean_up {
         done
     fi
     pkill -9 teamsyncd
+    redis-cli -n 0 DEL LAG_TABLE:ConfigDone
     exit
 }
 
diff --git a/files/image_config/logrotate/logrotate.d/rsyslog b/files/image_config/logrotate/logrotate.d/rsyslog
index ba550dcd242..13b7d51292b 100644
--- a/files/image_config/logrotate/logrotate.d/rsyslog
+++ b/files/image_config/logrotate/logrotate.d/rsyslog
@@ -35,6 +35,7 @@
 /var/log/quagga/zebra.log
 /var/log/swss/sairedis.rec
 /var/log/swss/swss.rec
+/var/log/swss/swss.cfg.rec
 {
     size 1M
     rotate 5000
diff --git a/platform/broadcom/docker-orchagent-brcm.mk b/platform/broadcom/docker-orchagent-brcm.mk
index 196a4d589a2..b7e7e77a191 100644
--- a/platform/broadcom/docker-orchagent-brcm.mk
+++ b/platform/broadcom/docker-orchagent-brcm.mk
@@ -16,3 +16,4 @@ $(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /var/log/swss:/var/log/swss:rw
 
 $(DOCKER_ORCHAGENT_BRCM)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel
+$(DOCKER_ORCHAGENT_BRCM)_BASE_IMAGE_FILES += cfgmgr:/usr/bin/cfgmgr
diff --git a/platform/cavium/docker-orchagent-cavm.mk b/platform/cavium/docker-orchagent-cavm.mk
index 57ebb2fd153..ea21c429956 100644
--- a/platform/cavium/docker-orchagent-cavm.mk
+++ b/platform/cavium/docker-orchagent-cavm.mk
@@ -16,3 +16,4 @@ $(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /var/log/swss:/var/log/swss:rw
 
 $(DOCKER_ORCHAGENT_CAVM)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel
+$(DOCKER_ORCHAGENT_BRCM)_BASE_IMAGE_FILES += cfgmgr:/usr/bin/cfgmgr
diff --git a/platform/centec/docker-orchagent-centec.mk b/platform/centec/docker-orchagent-centec.mk
index 695e481546b..b5cec46cb41 100644
--- a/platform/centec/docker-orchagent-centec.mk
+++ b/platform/centec/docker-orchagent-centec.mk
@@ -16,3 +16,4 @@ $(DOCKER_ORCHAGENT_CENTEC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_ORCHAGENT_CENTEC)_RUN_OPT += -v /var/log/swss:/var/log/swss:rw
 
 $(DOCKER_ORCHAGENT_CENTEC)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel
+$(DOCKER_ORCHAGENT_BRCM)_BASE_IMAGE_FILES   += cfgmgr:/usr/bin/cfgmgr
diff --git a/platform/mellanox/docker-orchagent-mlnx.mk b/platform/mellanox/docker-orchagent-mlnx.mk
index 20aa3833536..410890af273 100644
--- a/platform/mellanox/docker-orchagent-mlnx.mk
+++ b/platform/mellanox/docker-orchagent-mlnx.mk
@@ -16,3 +16,4 @@ $(DOCKER_ORCHAGENT_MLNX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_ORCHAGENT_MLNX)_RUN_OPT += -v /var/log/swss:/var/log/swss:rw
 
 $(DOCKER_ORCHAGENT_MLNX)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel
+$(DOCKER_ORCHAGENT_BRCM)_BASE_IMAGE_FILES += cfgmgr:/usr/bin/cfgmgr
diff --git a/src/libnl3/Makefile b/src/libnl3/Makefile
index efd234424df..488f73520f1 100644
--- a/src/libnl3/Makefile
+++ b/src/libnl3/Makefile
@@ -4,6 +4,7 @@ SHELL = /bin/bash
 
 MAIN_TARGET = libnl-3-200_$(LIBNL3_VERSION)_amd64.deb
 DERIVED_TARGETS = libnl-3-dev_$(LIBNL3_VERSION)_amd64.deb \
+		  libnl-3-200-dbg_$(LIBNL3_VERSION)_amd64.deb \
 		  libnl-genl-3-200_$(LIBNL3_VERSION)_amd64.deb \
 		  libnl-genl-3-dev_$(LIBNL3_VERSION)_amd64.deb \
 		  libnl-route-3-200_$(LIBNL3_VERSION)_amd64.deb \