diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index f3108a9d17..05ef959915 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM docker-config-engine
+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
@@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update
 
-RUN apt-get install -f -y ifupdown arping libdbus-1-3 libdaemon0 libjansson4 libpython2.7
+RUN apt-get install -f -y ifupdown arping libdbus-1-3 libdaemon0 libjansson4 libpython2.7 iproute2
 
 RUN apt-get install -f -y ndisc6 tcpdump python-scapy
 ## Install redis-tools dependencies
diff --git a/platform/barefoot/docker-orchagent-bfn.mk b/platform/barefoot/docker-orchagent-bfn.mk
index fefd396918..07565891d0 100644
--- a/platform/barefoot/docker-orchagent-bfn.mk
+++ b/platform/barefoot/docker-orchagent-bfn.mk
@@ -2,14 +2,15 @@
 
 DOCKER_ORCHAGENT_BFN = docker-orchagent-bfn.gz
 $(DOCKER_ORCHAGENT_BFN)_PATH = $(DOCKERS_PATH)/docker-orchagent
-$(DOCKER_ORCHAGENT_BFN)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
+$(DOCKER_ORCHAGENT_BFN)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
 ifeq ($(INSTALL_DEBUG_TOOLS), y)
 $(DOCKER_ORCHAGENT_BFN)_DEPENDS += $(SWSS_DBG) \
                                    $(LIBSWSSCOMMON_DBG) \
                                    $(LIBSAIREDIS_DBG)
 endif
-$(DOCKER_ORCHAGENT_BFN)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
+$(DOCKER_ORCHAGENT_BFN)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_BFN)
+SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT_BFN)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_BFN)
 
 $(DOCKER_ORCHAGENT_BFN)_CONTAINER_NAME = swss
diff --git a/platform/broadcom/docker-orchagent-brcm.mk b/platform/broadcom/docker-orchagent-brcm.mk
index dc3c31f43d..6957ca09ce 100644
--- a/platform/broadcom/docker-orchagent-brcm.mk
+++ b/platform/broadcom/docker-orchagent-brcm.mk
@@ -2,14 +2,15 @@
 
 DOCKER_ORCHAGENT_BRCM = docker-orchagent-brcm.gz
 $(DOCKER_ORCHAGENT_BRCM)_PATH = $(DOCKERS_PATH)/docker-orchagent
-$(DOCKER_ORCHAGENT_BRCM)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
+$(DOCKER_ORCHAGENT_BRCM)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
 ifeq ($(INSTALL_DEBUG_TOOLS), y)
 $(DOCKER_ORCHAGENT_BRCM)_DEPENDS += $(SWSS_DBG) \
                                     $(LIBSWSSCOMMON_DBG) \
                                     $(LIBSAIREDIS_DBG)
 endif
-$(DOCKER_ORCHAGENT_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
+$(DOCKER_ORCHAGENT_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_BRCM)
+SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT_BRCM)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_BRCM)
 
 $(DOCKER_ORCHAGENT_BRCM)_CONTAINER_NAME = swss
diff --git a/platform/cavium/docker-orchagent-cavm.mk b/platform/cavium/docker-orchagent-cavm.mk
index 282cdaa917..6ba614e751 100644
--- a/platform/cavium/docker-orchagent-cavm.mk
+++ b/platform/cavium/docker-orchagent-cavm.mk
@@ -2,14 +2,15 @@
 
 DOCKER_ORCHAGENT_CAVM = docker-orchagent-cavm.gz
 $(DOCKER_ORCHAGENT_CAVM)_PATH = $(DOCKERS_PATH)/docker-orchagent
-$(DOCKER_ORCHAGENT_CAVM)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
+$(DOCKER_ORCHAGENT_CAVM)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
 ifeq ($(INSTALL_DEBUG_TOOLS), y)
 $(DOCKER_ORCHAGENT_CAVM)_DEPENDS += $(SWSS_DBG) \
                                     $(LIBSWSSCOMMON_DBG) \
                                     $(LIBSAIREDIS_DBG)
 endif
-$(DOCKER_ORCHAGENT_CAVM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
+$(DOCKER_ORCHAGENT_CAVM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CAVM)
+SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT_CAVM)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CAVM)
 
 $(DOCKER_ORCHAGENT_CAVM)_CONTAINER_NAME = swss
diff --git a/platform/centec/docker-orchagent-centec.mk b/platform/centec/docker-orchagent-centec.mk
index 891f5550ba..b44356f657 100644
--- a/platform/centec/docker-orchagent-centec.mk
+++ b/platform/centec/docker-orchagent-centec.mk
@@ -2,14 +2,15 @@
 
 DOCKER_ORCHAGENT_CENTEC = docker-orchagent-centec.gz
 $(DOCKER_ORCHAGENT_CENTEC)_PATH = $(DOCKERS_PATH)/docker-orchagent
-$(DOCKER_ORCHAGENT_CENTEC)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
+$(DOCKER_ORCHAGENT_CENTEC)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
 ifeq ($(INSTALL_DEBUG_TOOLS), y)
 $(DOCKER_ORCHAGENT_CENTEC)_DEPENDS += $(SWSS_DBG) \
                                       $(LIBSWSSCOMMON_DBG) \
                                       $(LIBSAIREDIS_DBG)
 endif
-$(DOCKER_ORCHAGENT_CENTEC)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
+$(DOCKER_ORCHAGENT_CENTEC)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CENTEC)
+SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT_CENTEC)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CENTEC)
 
 $(DOCKER_ORCHAGENT_CENTEC)_CONTAINER_NAME = swss
diff --git a/platform/marvell/docker-orchagent-mrvl.mk b/platform/marvell/docker-orchagent-mrvl.mk
index 9c3c4c13a8..3561f88202 100644
--- a/platform/marvell/docker-orchagent-mrvl.mk
+++ b/platform/marvell/docker-orchagent-mrvl.mk
@@ -2,14 +2,15 @@
 
 DOCKER_ORCHAGENT_MRVL = docker-orchagent-mrvl.gz
 $(DOCKER_ORCHAGENT_MRVL)_PATH = $(DOCKERS_PATH)/docker-orchagent
-$(DOCKER_ORCHAGENT_MRVL)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
+$(DOCKER_ORCHAGENT_MRVL)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
 ifeq ($(INSTALL_DEBUG_TOOLS), y)
 $(DOCKER_ORCHAGENT_MRVL)_DEPENDS += $(SWSS_DBG) \
                                     $(LIBSWSSCOMMON_DBG) \
                                     $(LIBSAIREDIS_DBG)
 endif
-$(DOCKER_ORCHAGENT_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
+$(DOCKER_ORCHAGENT_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_MRVL)
+SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT_MRVL)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_MRVL)
 
 $(DOCKER_ORCHAGENT_MRVL)_CONTAINER_NAME = swss
diff --git a/platform/mellanox/docker-orchagent-mlnx.mk b/platform/mellanox/docker-orchagent-mlnx.mk
index 5e72beb4c3..575369746c 100644
--- a/platform/mellanox/docker-orchagent-mlnx.mk
+++ b/platform/mellanox/docker-orchagent-mlnx.mk
@@ -2,14 +2,15 @@
 
 DOCKER_ORCHAGENT_MLNX = docker-orchagent-mlnx.gz
 $(DOCKER_ORCHAGENT_MLNX)_PATH = $(DOCKERS_PATH)/docker-orchagent
-$(DOCKER_ORCHAGENT_MLNX)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
+$(DOCKER_ORCHAGENT_MLNX)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
 ifeq ($(INSTALL_DEBUG_TOOLS), y)
 $(DOCKER_ORCHAGENT_MLNX)_DEPENDS += $(SWSS_DBG) \
                                     $(LIBSWSSCOMMON_DBG) \
                                     $(LIBSAIREDIS_DBG)
 endif
-$(DOCKER_ORCHAGENT_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
+$(DOCKER_ORCHAGENT_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_MLNX)
+SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT_MLNX)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_MLNX)
 
 $(DOCKER_ORCHAGENT_MLNX)_CONTAINER_NAME = swss
diff --git a/platform/vs/docker-orchagent-vs.mk b/platform/vs/docker-orchagent-vs.mk
index 185e3ce077..28794cad25 100644
--- a/platform/vs/docker-orchagent-vs.mk
+++ b/platform/vs/docker-orchagent-vs.mk
@@ -2,14 +2,15 @@
 
 DOCKER_ORCHAGENT_VS = docker-orchagent-vs.gz
 $(DOCKER_ORCHAGENT_VS)_PATH = $(DOCKERS_PATH)/docker-orchagent
-$(DOCKER_ORCHAGENT_VS)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
+$(DOCKER_ORCHAGENT_VS)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
 ifeq ($(INSTALL_DEBUG_TOOLS), y)
 $(DOCKER_ORCHAGENT_VS)_DEPENDS += $(SWSS_DBG) \
                                   $(LIBSWSSCOMMON_DBG) \
                                   $(LIBSAIREDIS_DBG)
 endif
-$(DOCKER_ORCHAGENT_VS)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
+$(DOCKER_ORCHAGENT_VS)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_VS)
+SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT_VS)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_VS)
 
 $(DOCKER_ORCHAGENT_VS)_CONTAINER_NAME = swss
diff --git a/src/sonic-swss b/src/sonic-swss
index 3f14956c91..aa92326719 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 3f14956c91442a0f26da4e4b8c875154cd4f6bde
+Subproject commit aa923267195eafd10bb6c3b9c0cd3ffe0264182b