diff --git a/platform/barefoot/libsaithrift-dev.mk b/platform/barefoot/libsaithrift-dev.mk
index c9c8cbb3ad..0289a41b29 100644
--- a/platform/barefoot/libsaithrift-dev.mk
+++ b/platform/barefoot/libsaithrift-dev.mk
@@ -1,7 +1,20 @@
 # libsaithrift-dev package
 
-LIBSAITHRIFT_DEV_BFN = libsaithrift-dev_0.9.4_amd64.deb
-$(LIBSAITHRIFT_DEV_BFN)_SRC_PATH = $(SRC_PATH)/SAI
-$(LIBSAITHRIFT_DEV_BFN)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(BFN_SAI) $(BFN_SAI_DEV)
-$(LIBSAITHRIFT_DEV_BFN)_RDEPENDS += $(LIBTHRIFT) $(BFN_SAI)
-#SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_BFN)
+SAI_VER = 0.9.4
+
+LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_amd64.deb
+$(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
+$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(BFN_SAI) $(BFN_SAI_DEV)
+$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(BFN_SAI)
+SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV)
+
+PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_amd64.deb
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT)))
+
+SAISERVER = saiserver_$(SAI_VER)_amd64.deb
+$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI)
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER)))
+
+SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_amd64.deb
+$(SAISERVER_DBG)_RDEPENDS += $(SAISERVER)
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER_DBG)))
diff --git a/platform/barefoot/python-saithrift.mk b/platform/barefoot/python-saithrift.mk
deleted file mode 100644
index ba4846402f..0000000000
--- a/platform/barefoot/python-saithrift.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# python-saithrift package
-
-PYTHON_SAITHRIFT_BFN = python-saithrift_0.9.4_amd64.deb
-$(PYTHON_SAITHRIFT_BFN)_SRC_PATH = $(SRC_PATH)/SAI
-$(PYTHON_SAITHRIFT_BFN)_DEPENDS += $(BFN_SAI_DEV) $(BFN_SAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV)
-#SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_BFN)
diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk
index b041aa37aa..543ea63e7f 100644
--- a/platform/broadcom/libsaithrift-dev.mk
+++ b/platform/broadcom/libsaithrift-dev.mk
@@ -1,6 +1,6 @@
 # libsaithrift-dev package
 
-SAI_VER = 1.3.5
+SAI_VER = 0.9.4
 
 LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_amd64.deb
 $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 61fcc34549..227734e9bb 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,9 +1,9 @@
-BRCM_SAI = libsaibcm_3.3.4.3-2_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.3/libsaibcm_3.3.4.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=GO2B4zoVJi0j0%2FZKbf8yhRL0oQ3clJEZFiy2AC14xSc%3D&se=2032-10-20T20%3A38%3A13Z&sp=r"
+BRCM_SAI = libsaibcm_3.3.4.3m-3_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.3/libsaibcm_3.3.4.3m-3_amd64.deb?sv=2015-04-05&sr=b&sig=QpwawYAGZOdlH6Z7PLOlHSl%2B%2Fcqe0IrDAq2a7hlmFmg%3D&se=2156-01-09T02%3A48%3A41Z&sp=r"
 
-BRCM_SAI_DEV = libsaibcm-dev_3.3.4.3-2_amd64.deb
+BRCM_SAI_DEV = libsaibcm-dev_3.3.4.3m-3_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.3/libsaibcm-dev_3.3.4.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=aYEpjYMEIqfMnAiraXr9K%2FspEb8d2qGdwcIBxO3%2BjjY%3D&se=2032-10-20T20%3A37%3A51Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.3/libsaibcm-dev_3.3.4.3m-3_amd64.deb?sv=2015-04-05&sr=b&sig=8CYNbomcJhVI%2BFdIUN%2F1rIOM%2BwwMzn33Lb8Llgo8GsY%3D&se=2156-01-09T02%3A49%3A03Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)
diff --git a/platform/centec/libsaithrift-dev.mk b/platform/centec/libsaithrift-dev.mk
index b0e13fa028..fdcbfd664e 100644
--- a/platform/centec/libsaithrift-dev.mk
+++ b/platform/centec/libsaithrift-dev.mk
@@ -1,7 +1,20 @@
 # libsaithrift-dev package
 
-LIBSAITHRIFT_DEV_CENTEC = libsaithrift-dev_1.3.5_amd64.deb
-$(LIBSAITHRIFT_DEV_CENTEC)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
-$(LIBSAITHRIFT_DEV_CENTEC)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(CENTEC_SAI)
-$(LIBSAITHRIFT_DEV_CENTEC)_RDEPENDS += $(LIBTHRIFT) $(CENTEC_SAI)
-SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_CENTEC)
+SAI_VER = 0.9.4
+
+LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_amd64.deb
+$(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
+$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(CENTEC_SAI)
+$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(CENTEC_SAI)
+SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV)
+
+PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_amd64.deb
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT)))
+
+SAISERVER = saiserver_$(SAI_VER)_amd64.deb
+$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI)
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER)))
+
+SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_amd64.deb
+$(SAISERVER_DBG)_RDEPENDS += $(SAISERVER)
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER_DBG)))
diff --git a/platform/centec/python-saithrift.mk b/platform/centec/python-saithrift.mk
deleted file mode 100644
index b62beff892..0000000000
--- a/platform/centec/python-saithrift.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# python-saithrift package
-
-PYTHON_SAITHRIFT_CENTEC = python-saithrift_1.3.5_amd64.deb
-$(PYTHON_SAITHRIFT_CENTEC)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
-$(PYTHON_SAITHRIFT_CENTEC)_DEPENDS += $(CENTEC_SAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV)
-SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_CENTEC)
diff --git a/platform/marvell/libsaithrift-dev.mk b/platform/marvell/libsaithrift-dev.mk
index 270bf25b87..d1607a1ba2 100644
--- a/platform/marvell/libsaithrift-dev.mk
+++ b/platform/marvell/libsaithrift-dev.mk
@@ -1,7 +1,20 @@
 # libsaithrift-dev package
 
-LIBSAITHRIFT_DEV_MRVL = libsaithrift-dev_1.2.1_amd64.deb
-$(LIBSAITHRIFT_DEV_MRVL)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
-$(LIBSAITHRIFT_DEV_MRVL)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(MRVL_FPA) $(MRVL_SAI)
-$(LIBSAITHRIFT_DEV_MRVL)_RDEPENDS += $(LIBTHRIFT) $(MRVL_SAI)
-SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_MRVL)
+SAI_VER = 0.9.4
+
+LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_amd64.deb
+$(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
+$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(MRVL_FPA) $(MRVL_SAI)
+$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(MRVL_SAI)
+SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV)
+
+PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_amd64.deb
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT)))
+
+SAISERVER = saiserver_$(SAI_VER)_amd64.deb
+$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI)
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER)))
+
+SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_amd64.deb
+$(SAISERVER_DBG)_RDEPENDS += $(SAISERVER)
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER_DBG)))
diff --git a/platform/marvell/python-saithrift.mk b/platform/marvell/python-saithrift.mk
deleted file mode 100644
index f7bea43589..0000000000
--- a/platform/marvell/python-saithrift.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# python-saithrift package
-
-PYTHON_SAITHRIFT_MRVL = python-saithrift_1.2.1_amd64.deb
-$(PYTHON_SAITHRIFT_MRVL)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
-$(PYTHON_SAITHRIFT_MRVL)_DEPENDS += $(MRVL_FPA) $(MRVL_SAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV)
-SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_MRVL)
diff --git a/platform/mellanox/libsaithrift-dev.mk b/platform/mellanox/libsaithrift-dev.mk
index 6d67ef1541..b0ef5746db 100644
--- a/platform/mellanox/libsaithrift-dev.mk
+++ b/platform/mellanox/libsaithrift-dev.mk
@@ -1,6 +1,6 @@
 # libsaithrift-dev package
 
-SAI_VER = 1.3.5
+SAI_VER = 0.9.4
 
 LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_amd64.deb
 $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk
index 8dc27bf532..2c220dfa96 100644
--- a/platform/mellanox/mlnx-sai.mk
+++ b/platform/mellanox/mlnx-sai.mk
@@ -1,7 +1,7 @@
 # Mellanox SAI
 
-MLNX_SAI_VERSION = SAIRel1.13.4-master
-MLNX_SAI_REVISION = 079a5aebf184d707847a4e2aa1cfb502e1def32a
+MLNX_SAI_VERSION = ffbwithv1.4-sonicffb
+MLNX_SAI_REVISION = 489702025311e019b6565bfd74f91f2c518dcdab
 
 export MLNX_SAI_VERSION MLNX_SAI_REVISION
 
diff --git a/platform/nephos/libsaithrift-dev.mk b/platform/nephos/libsaithrift-dev.mk
index e3828eeb0f..6ffb4bf512 100644
--- a/platform/nephos/libsaithrift-dev.mk
+++ b/platform/nephos/libsaithrift-dev.mk
@@ -1,7 +1,20 @@
 # libsaithrift-dev package
 
-LIBSAITHRIFT_DEV_NEPHOS = libsaithrift-dev_1.3.5_amd64.deb
-$(LIBSAITHRIFT_DEV_NEPHOS)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
-$(LIBSAITHRIFT_DEV_NEPHOS)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(NEPHOS_SAI) $(NEPHOS_SAI_DEV)
-$(LIBSAITHRIFT_DEV_NEPHOS)_RDEPENDS += $(LIBTHRIFT) $(NEPHOS_SAI)
-SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_NEPHOS)
+SAI_VER = 0.9.4
+
+LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_amd64.deb
+$(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
+$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(NEPHOS_SAI) $(NEPHOS_SAI_DEV)
+$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(NEPHOS_SAI)
+SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV)
+
+PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_amd64.deb
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT)))
+
+SAISERVER = saiserver_$(SAI_VER)_amd64.deb
+$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI)
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER)))
+
+SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_amd64.deb
+$(SAISERVER_DBG)_RDEPENDS += $(SAISERVER)
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER_DBG)))
diff --git a/platform/nephos/python-saithrift.mk b/platform/nephos/python-saithrift.mk
deleted file mode 100644
index 9305b0628a..0000000000
--- a/platform/nephos/python-saithrift.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# python-saithrift package
-
-PYTHON_SAITHRIFT_NEPHOS = python-saithrift_1.3.5_amd64.deb
-$(PYTHON_SAITHRIFT_NEPHOS)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
-$(PYTHON_SAITHRIFT_NEPHOS)_DEPENDS += $(NEPHOS_SAI_DEV) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV)
-SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_NEPHOS)
diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index b1b739b555..d685e3513b 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit b1b739b5552aac1acbf9d3d0f4572a7f1d707909
+Subproject commit d685e3513b3ac67651f50125938338bc26ae1c56
diff --git a/src/sonic-swss b/src/sonic-swss
index dee34bcdae..a6d60f2ed0 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit dee34bcdaeef067972e26c3b2d7695a2f9e02c12
+Subproject commit a6d60f2ed0b0059be6014e2aba7b57f4dd7387a0
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index e8caaead52..ec04a5ab3d 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit e8caaead527d46d42e41e99b884f41c57f70018b
+Subproject commit ec04a5ab3d1ba5bb3f4cb68789078ff241ec06f3
diff --git a/src/sonic-utilities b/src/sonic-utilities
index c6666e2bcf..b44b462a14 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit c6666e2bcf94cdca1f30d26d7e611f3db9f7e7cf
+Subproject commit b44b462a14b9a4b7c2d6091b5355c046acd9dac8