diff --git a/Makefile b/Makefile
index 1f572c987756..44fde4de25ca 100644
--- a/Makefile
+++ b/Makefile
@@ -170,6 +170,10 @@ target/docker-sonic-p4.gz: target/docker-base.gz $(addprefix dockers/docker-soni
 	docker load < $<
 	$(call build_docker,$(patsubst target/%.gz,%,$@),$@)
 
+target/docker-platform-monitor.gz: target/docker-base.gz
+	docker load < $<
+	$(call build_docker,$(patsubst target/%.gz,%,$@),$@)
+
 ## Rules: linux image content
 deps/linux-image-3.16.0-4-amd64_%.deb: src/sonic-linux-kernel/linux-image-3.16.0-4-amd64_%.deb
 	mkdir -p `dirname $@` && cp $< $(dir $@)
@@ -182,12 +186,12 @@ target/sonic-aboot.bin: deps/linux-image-3.16.0-4-amd64_3.16.7-ckt11-2+acs8u2_am
 	./build_debian.sh "$(USERNAME)" "$(PASSWORD_ENCRYPTED)" && TARGET_MACHINE=aboot ./build_image.sh
 
 ## Note: docker-fpm.gz must be the last to build the implicit dependency fpmsyncd
-brcm-all: target/sonic-generic.bin $(addprefix target/,docker-syncd.gz docker-orchagent.gz docker-fpm.gz docker-team.gz docker-database.gz docker-snmp-sv2.gz docker-lldp-sv2.gz)
+brcm-all: target/sonic-generic.bin $(addprefix target/,docker-syncd.gz docker-orchagent.gz docker-fpm.gz docker-team.gz docker-database.gz docker-snmp-sv2.gz docker-lldp-sv2.gz docker-platform-monitor.gz)
 
 ## Note: docker-fpm.gz must be the last to build the implicit dependency fpmsyncd
-mlnx-all: target/sonic-generic.bin $(addprefix target/,docker-syncd-mlnx.gz docker-orchagent-mlnx.gz docker-fpm.gz docker-team.gz docker-database.gz docker-snmp-sv2.gz docker-lldp-sv2.gz)
+mlnx-all: target/sonic-generic.bin $(addprefix target/,docker-syncd-mlnx.gz docker-orchagent-mlnx.gz docker-fpm.gz docker-team.gz docker-database.gz docker-snmp-sv2.gz docker-lldp-sv2.gz docker-platform-monitor.gz)
 
 ## Note: docker-fpm.gz must be the last to build the implicit dependency fpmsyncd
-cavm-all: target/sonic-generic.bin $(addprefix target/,docker-syncd-cavm.gz docker-orchagent-cavm.gz docker-fpm.gz docker-team.gz docker-database.gz docker-snmp-sv2.gz docker-lldp-sv2.gz)
+cavm-all: target/sonic-generic.bin $(addprefix target/,docker-syncd-cavm.gz docker-orchagent-cavm.gz docker-fpm.gz docker-team.gz docker-database.gz docker-snmp-sv2.gz docker-lldp-sv2.gz docker-platform-monitor.gz)
 
 p4-all: $(addprefix target/,docker-sonic-p4.gz)
diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 494b231a6658..96bcb6382a12 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 494b231a6658a5b21b71e35ab0f078701e938742
+Subproject commit 96bcb6382a12d789830d848fe05681ee75238162
diff --git a/src/sonic-swss b/src/sonic-swss
index 02621bcdb568..05bac483585d 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 02621bcdb5689450446ea0d618a879a110af86c7
+Subproject commit 05bac483585dd5e564ed5db43efb1020fa25c703
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 947fa0733965..136aca5ff74d 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 947fa0733965450ad5b108cfd17a251ae3b7b709
+Subproject commit 136aca5ff74d7082d0a1def8b02032689ce3507e