diff --git a/.gitmodules b/.gitmodules
index 1c7a6da0281d..e0223870aae9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,7 @@
 	url = https://github.com/Azure/sonic-linux-kernel
 [submodule "sonic-sairedis"]
 	path = src/sonic-sairedis
-	url = https://github.com/Azure/sonic-sairedis
+	url = https://github.com/nazarii-gnydyn/sonic-sairedis
 [submodule "sonic-swss"]
 	path = src/sonic-swss
 	url = https://github.com/Azure/sonic-swss
diff --git a/build_debian.sh b/build_debian.sh
index 15bde44c112e..7d8c73d05efc 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -111,7 +111,7 @@ echo '[INFO] Install SONiC linux kernel image'
 ## Note: duplicate apt-get command to ensure every line return zero
 sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/initramfs-tools_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
-sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/linux-image-3.16.0-4-amd64_*.deb || \
+sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/linux-image-3.16.0-5-amd64_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
 
 ## Update initramfs for booting with squashfs+aufs
@@ -142,10 +142,10 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
 sudo chroot $FILESYSTEM_ROOT update-initramfs -u
 
 ## Install latest intel igb driver
-sudo cp target/debs/igb.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-4-amd64/kernel/drivers/net/ethernet/intel/igb/igb.ko
+sudo cp target/debs/igb.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-5-amd64/kernel/drivers/net/ethernet/intel/igb/igb.ko
 
 ## Install latest intel ixgbe driver
-sudo cp target/debs/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-4-amd64/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
+sudo cp target/debs/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-5-amd64/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
 
 ## Install docker
 echo '[INFO] Install docker'
diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index a2c683b20c91..3f2d2cdecc3c 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -18,8 +18,8 @@
 
 set -x
 
-kernel=boot/vmlinuz-3.16.0-4-amd64
-initrd=boot/initrd.img-3.16.0-4-amd64
+kernel=boot/vmlinuz-3.16.0-5-amd64
+initrd=boot/initrd.img-3.16.0-5-amd64
 kernel_params=kernel-params
 
 aboot_machine="arista_unknown"
diff --git a/files/build_templates/swss.service.j2 b/files/build_templates/swss.service.j2
index b18321676b78..50f369fe7f4a 100644
--- a/files/build_templates/swss.service.j2
+++ b/files/build_templates/swss.service.j2
@@ -2,16 +2,16 @@
 Description=switch state service
 Requires=database.service
 {% if sonic_asic_platform == 'broadcom' %}
-Requires=opennsl-modules-3.16.0-4-amd64.service
+Requires=opennsl-modules-3.16.0-5-amd64.service
 {% elif sonic_asic_platform == 'nephos' %}
-Requires=nps-modules-3.16.0-4-amd64.service
+Requires=nps-modules-3.16.0-5-amd64.service
 {% endif %}
 After=database.service
 After=interfaces-config.service
 {% if sonic_asic_platform == 'broadcom' %}
-After=opennsl-modules-3.16.0-4-amd64.service
+After=opennsl-modules-3.16.0-5-amd64.service
 {% elif sonic_asic_platform == 'nephos' %}
-After=nps-modules-3.16.0-4-amd64.service
+After=nps-modules-3.16.0-5-amd64.service
 {% endif %}
 
 [Service]
diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
index 2a62132be054..6d29a8b2f4af 100755
--- a/installer/x86_64/install.sh
+++ b/installer/x86_64/install.sh
@@ -549,11 +549,11 @@ menuentry '$demo_grub_entry' {
         if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
         insmod part_msdos
         insmod ext2
-        linux   /$image_dir/boot/vmlinuz-3.16.0-4-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
+        linux   /$image_dir/boot/vmlinuz-3.16.0-5-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
                 loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs                       \
                 apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
         echo    'Loading $demo_volume_label $demo_type initial ramdisk ...'
-        initrd  /$image_dir/boot/initrd.img-3.16.0-4-amd64
+        initrd  /$image_dir/boot/initrd.img-3.16.0-5-amd64
 }
 EOF
 
diff --git a/platform/cavium/cavm-sai.mk b/platform/cavium/cavm-sai.mk
index 0008135729c5..0fc09b4636e7 100644
--- a/platform/cavium/cavm-sai.mk
+++ b/platform/cavium/cavm-sai.mk
@@ -1,13 +1,18 @@
 # Cavium SAI
 
-CAVM_SAI_GITHUB = https://github.com/XPliant/OpenXPS/raw/13a7eaf10f523e7887964ca235f19095fcc88537/SAI/cavm-sai/
+#CAVM_SAI_GITHUB = https://github.com/XPliant/OpenXPS/raw/13a7eaf10f523e7887964ca235f19095fcc88537/SAI/cavm-sai/
+LOCAL_PATH=/sonic
 
 CAVM_LIBSAI = libsai.deb
 CAVM_SAI = sai.deb
 XP_TOOLS = xp-tools.deb
 
-$(CAVM_LIBSAI)_URL = $(CAVM_SAI_GITHUB)/$(CAVM_LIBSAI)
-$(CAVM_SAI)_URL = $(CAVM_SAI_GITHUB)/$(CAVM_SAI)
-$(XP_TOOLS)_URL = $(CAVM_SAI_GITHUB)/$(XP_TOOLS)
+#$(CAVM_LIBSAI)_URL = $(CAVM_SAI_GITHUB)/$(CAVM_LIBSAI)
+#$(CAVM_SAI)_URL = $(CAVM_SAI_GITHUB)/$(CAVM_SAI)
+#$(XP_TOOLS)_URL = $(CAVM_SAI_GITHUB)/$(XP_TOOLS)
+$(CAVM_LIBSAI)_PATH = $(LOCAL_PATH)
+$(CAVM_SAI)_PATH = $(LOCAL_PATH)
+$(XP_TOOLS)_PATH = $(LOCAL_PATH)
 
-SONIC_ONLINE_DEBS += $(CAVM_LIBSAI) $(CAVM_SAI) $(XP_TOOLS)
+#SONIC_ONLINE_DEBS += $(CAVM_LIBSAI) $(CAVM_SAI) $(XP_TOOLS)
+SONIC_COPY_DEBS += $(CAVM_LIBSAI) $(CAVM_SAI) $(XP_TOOLS)
diff --git a/platform/cavium/cavm-xpnet.mk b/platform/cavium/cavm-xpnet.mk
index ed86558a36ae..610d9c1afb73 100644
--- a/platform/cavium/cavm-xpnet.mk
+++ b/platform/cavium/cavm-xpnet.mk
@@ -1,6 +1,9 @@
-CAVM_SAI_URL = https://github.com/XPliant/OpenXPS/raw/c26aea6a7098936ab3692e148238d73fa8962585/SAI
+#CAVM_SAI_URL = https://github.com/XPliant/OpenXPS/raw/c26aea6a7098936ab3692e148238d73fa8962585/SAI
+LOCAL_PATH=/sonic
 
 CAVM_XPNET_DEB = xp80-Pcie-Endpoint.deb
-$(CAVM_XPNET_DEB)_URL = $(CAVM_SAI_URL)/netdev/$(CAVM_XPNET_DEB)
+#$(CAVM_XPNET_DEB)_URL = $(CAVM_SAI_URL)/netdev/$(CAVM_XPNET_DEB)
+$(CAVM_XPNET_DEB)_PATH = $(LOCAL_PATH)
 
-SONIC_ONLINE_DEBS += $(CAVM_XPNET_DEB)
+#SONIC_ONLINE_DEBS += $(CAVM_XPNET_DEB)
+SONIC_COPY_DEBS += $(CAVM_XPNET_DEB)
diff --git a/platform/cavium/cavm_platform_modules/DEBIAN/control b/platform/cavium/cavm_platform_modules/DEBIAN/control
index 75f8adc0cbd2..078cc647e594 100755
--- a/platform/cavium/cavm_platform_modules/DEBIAN/control
+++ b/platform/cavium/cavm_platform_modules/DEBIAN/control
@@ -1,6 +1,6 @@
 Package: cavm-platform-modules
 Version: 1.0
 Architecture: amd64
-Depends: linux-image-3.16.0-4-amd64
+Depends: linux-image-3.16.0-5-amd64
 Maintainer: Nadiya.Stetskovych@cavium.com
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/cavium/libsaithrift-dev.mk b/platform/cavium/libsaithrift-dev.mk
index 4a19fabffaf2..3b13b83dca8c 100644
--- a/platform/cavium/libsaithrift-dev.mk
+++ b/platform/cavium/libsaithrift-dev.mk
@@ -1,7 +1,7 @@
 # libsaithrift-dev package
 
-LIBSAITHRIFT_DEV_CAVM = libsaithrift-dev_0.9.4_amd64.deb
-$(LIBSAITHRIFT_DEV_CAVM)_SRC_PATH = $(SRC_PATH)/SAI
+LIBSAITHRIFT_DEV_CAVM = libsaithrift-dev_1.0_amd64.deb
+$(LIBSAITHRIFT_DEV_CAVM)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
 $(LIBSAITHRIFT_DEV_CAVM)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(CAVM_LIBSAI) $(CAVM_SAI)
 $(LIBSAITHRIFT_DEV_CAVM)_RDEPENDS += $(LIBTHRIFT) $(CAVM_SAI)
 SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_CAVM)
diff --git a/platform/cavium/python-saithrift.mk b/platform/cavium/python-saithrift.mk
index 91d00ebaebc0..73c9671604d3 100644
--- a/platform/cavium/python-saithrift.mk
+++ b/platform/cavium/python-saithrift.mk
@@ -1,6 +1,6 @@
 # python-saithrift package
 
-PYTHON_SAITHRIFT_CAVM = python-saithrift_0.9.4_amd64.deb
-$(PYTHON_SAITHRIFT_CAVM)_SRC_PATH = $(SRC_PATH)/SAI
+PYTHON_SAITHRIFT_CAVM = python-saithrift_1.0_amd64.deb
+$(PYTHON_SAITHRIFT_CAVM)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
 $(PYTHON_SAITHRIFT_CAVM)_DEPENDS += $(CAVM_LIBSAI) $(CAVM_SAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV)
 SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_CAVM)
diff --git a/platform/cavium/rules.mk b/platform/cavium/rules.mk
index 37a9bd7c994b..3928ae7ff8fa 100644
--- a/platform/cavium/rules.mk
+++ b/platform/cavium/rules.mk
@@ -15,7 +15,8 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_SYNCD_CAVM_RPC)
 
 # Inject cavium sai into sairedis
-$(LIBSAIREDIS)_DEPENDS += $(CAVM_SAI) $(CAVM_LIBSAI) $(LIBSAITHRIFT_DEV_CAVM)
+#$(LIBSAIREDIS)_DEPENDS += $(CAVM_SAI) $(CAVM_LIBSAI) $(LIBSAITHRIFT_DEV_CAVM)
+$(LIBSAIREDIS)_DEPENDS += $(CAVM_SAI) $(CAVM_LIBSAI)
 
 # Runtime dependency on cavium sai is set only for syncd
 $(SYNCD)_RDEPENDS += $(CAVM_SAI)
diff --git a/rules/linux-kernel.mk b/rules/linux-kernel.mk
index 1e7fad0fd840..ce7ebc8418ff 100644
--- a/rules/linux-kernel.mk
+++ b/rules/linux-kernel.mk
@@ -1,9 +1,9 @@
 # linux kernel package
 
-KVERSION_SHORT = 3.16.0-4
+KVERSION_SHORT = 3.16.0-5
 KVERSION = $(KVERSION_SHORT)-amd64
-KERNEL_VERSION = 3.16.43
-KERNEL_SUBVERSION = 2+deb8u5
+KERNEL_VERSION = 3.16.51
+KERNEL_SUBVERSION = 3+deb8u1
 
 export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION
 
diff --git a/src/igb/Makefile b/src/igb/Makefile
index e814ce0a7db7..37fb6b1390d2 100644
--- a/src/igb/Makefile
+++ b/src/igb/Makefile
@@ -15,7 +15,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	# Build the package
 	pushd src
-	export BUILD_KERNEL=3.16.0-4-amd64
+	export BUILD_KERNEL=3.16.0-5-amd64
 	make
 	popd
 
diff --git a/src/ixgbe/Makefile b/src/ixgbe/Makefile
index 133fc7db0570..ea239698dd27 100644
--- a/src/ixgbe/Makefile
+++ b/src/ixgbe/Makefile
@@ -14,7 +14,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	# Build the package
 	pushd src
-	export BUILD_KERNEL=3.16.0-4-amd64
+	export BUILD_KERNEL=3.16.0-5-amd64
 	make
 	popd
 
diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index ff5a3b588cc7..02b5c0b08f58 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit ff5a3b588cc7dbd763fb13c1125710134c8cdd12
+Subproject commit 02b5c0b08f5812d1d7af98f77dfdb2bb11ad1991
diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 3b817bbe14f1..78c61edf322e 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 3b817bbe14f1e5177e6200c7a80ab74db4768eaa
+Subproject commit 78c61edf322e1b891db11682f1f6c72935de2252