diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2
index fea0fe0c21..d4ac92feec 100644
--- a/dockers/docker-sonic-mgmt/Dockerfile.j2
+++ b/dockers/docker-sonic-mgmt/Dockerfile.j2
@@ -20,7 +20,11 @@ RUN apt-get install -y \
                 libxslt1-dev \
                 python-setuptools \
                 build-essential \
-                curl
+                curl \
+                cmake \
+                tcpdump \
+                python-dev \
+                python-scapy
 
 # For JNLP launcher
 RUN apt-get install -y default-jre
@@ -46,7 +50,26 @@ RUN pip install ipaddr \
                 jinja2==2.7.2 \
                 cffi==1.10.0 \
                 paramiko==2.1.2 \
-                passlib
+                passlib \
+                ipython==5.4.1 \
+    && git clone https://github.com/p4lang/scapy-vxlan.git \
+    && cd scapy-vxlan \
+    && python setup.py install \
+    && cd .. \
+    && rm -fr scapy-vxlan \
+    && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    && tar xvfz 1.0.0.tar.gz \
+    && cd nanomsg-1.0.0    \
+    && mkdir -p build      \
+    && cd build            \
+    && cmake ..            \
+    && make install        \
+    && ldconfig            \
+    && cd ../..            \
+    && rm -fr nanomsg-1.0.0 \
+    && rm -f 1.0.0.tar.gz  \
+    && pip install nnpy    \
+    && pip install dpkt
 
 # Install Microsoft Azure Kusto Library for Python
 RUN pip install azure-kusto-data==0.0.13 \
diff --git a/rules/docker-sonic-mgmt.mk b/rules/docker-sonic-mgmt.mk
index 2f4908e43d..b1aaad3487 100644
--- a/rules/docker-sonic-mgmt.mk
+++ b/rules/docker-sonic-mgmt.mk
@@ -1,5 +1,5 @@
 # docker image for sonic-mgmt
 DOCKER_SONIC_MGMT = docker-sonic-mgmt.gz
 $(DOCKER_SONIC_MGMT)_PATH = $(DOCKERS_PATH)/docker-sonic-mgmt
-$(DOCKER_SONIC_MGMT)_DEPENDS += $(SONIC_DEVICE_DATA)
+$(DOCKER_SONIC_MGMT)_DEPENDS += $(SONIC_DEVICE_DATA) $(PTF)
 SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_MGMT)
diff --git a/src/ptf b/src/ptf
index aac6efd0a7..36a3e3d9ac 160000
--- a/src/ptf
+++ b/src/ptf
@@ -1 +1 @@
-Subproject commit aac6efd0a78bf51f63727e7a13dc79f91f13686e
+Subproject commit 36a3e3d9ac0447d28161d24028401239d756875f