diff --git a/dockers/docker-orchagent/start.sh b/dockers/docker-orchagent/start.sh
index 5733f9511a..d9e9bcad0b 100755
--- a/dockers/docker-orchagent/start.sh
+++ b/dockers/docker-orchagent/start.sh
@@ -41,6 +41,8 @@ supervisorctl start enable_counters
 
 supervisorctl start vrfmgrd
 
+supervisorctl start nbrmgrd
+
 # Start arp_update when VLAN exists
 VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
 if [ "$VLAN" != "" ]; then
diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
index 13806a83ff..2fe25a7a41 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -127,3 +127,11 @@ startretries=0
 stdout_logfile=syslog
 stderr_logfile=syslog
 
+[program:nbrmgrd]
+command=/usr/bin/nbrmgrd
+priority=16
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+
diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh
index 6eec5b5dbc..3871dc375f 100755
--- a/platform/vs/docker-sonic-vs/start.sh
+++ b/platform/vs/docker-sonic-vs/start.sh
@@ -62,6 +62,8 @@ supervisorctl start buffermgrd
 
 supervisorctl start vrfmgrd
 
+supervisorctl start nbrmgrd
+
 # Start arp_update when VLAN exists
 VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
 if [ "$VLAN" != "" ]; then
diff --git a/platform/vs/docker-sonic-vs/supervisord.conf b/platform/vs/docker-sonic-vs/supervisord.conf
index 3435f24575..3fe3df30c2 100644
--- a/platform/vs/docker-sonic-vs/supervisord.conf
+++ b/platform/vs/docker-sonic-vs/supervisord.conf
@@ -164,3 +164,11 @@ startsecs=0
 startretries=0
 stdout_logfile=syslog
 stderr_logfile=syslog
+
+[program:nbrmgrd]
+command=/usr/bin/nbrmgrd
+priority=20
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
diff --git a/src/sonic-swss b/src/sonic-swss
index c74dc6079f..705b092719 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit c74dc6079f49814ef290b65ed3e80b9cb27b310b
+Subproject commit 705b092719384fa9fa86a952805bfc698092e0ff
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 2a37c5c7c4..edbfeec663 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 2a37c5c7c4fdcc607613a534f9d0daedadea1f10
+Subproject commit edbfeec663f32585cbf3468a88deb950fed3bb69