diff --git a/dockers/docker-base/Dockerfile.j2 b/dockers/docker-base/Dockerfile.j2
index 79f5b0b5eb1..68a3176ab6e 100644
--- a/dockers/docker-base/Dockerfile.j2
+++ b/dockers/docker-base/Dockerfile.j2
@@ -67,6 +67,9 @@ RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return
 {%- endfor %}
 {%- endif %}
 
+## Install redis-tools dependencies
+RUN apt-get -y install libjemalloc1
+
 {% if docker_base_dbgs.strip() -%}
 # Install common debug-packages
 {%- for dbg_pkg in docker_base_dbgs.split(' ') %}
diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index 54088db30e5..6b835297b7d 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -11,9 +11,6 @@ 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 ndisc6 tcpdump python-scapy
-## Install redis-tools dependencies
-## TODO: implicitly install dependencies
-RUN apt-get -y install libjemalloc1
 
 RUN apt-get install -y libelf1 libmnl0
 
diff --git a/dockers/docker-sonic-telemetry/Dockerfile.j2 b/dockers/docker-sonic-telemetry/Dockerfile.j2
index 6b77f999e5e..90fc13f28c6 100644
--- a/dockers/docker-sonic-telemetry/Dockerfile.j2
+++ b/dockers/docker-sonic-telemetry/Dockerfile.j2
@@ -10,10 +10,6 @@ RUN apt-get update
 
 RUN apt-get install -f -y libdbus-1-3 libdaemon0 libjansson4
 
-## Install redis-tools dependencies
-## TODO: implicitly install dependencies
-RUN apt-get -y install libjemalloc1
-
 COPY \
 {% for deb in docker_sonic_telemetry_debs.split(' ') -%}
 debs/{{ deb }}{{' '}}
diff --git a/dockers/docker-teamd/Dockerfile.j2 b/dockers/docker-teamd/Dockerfile.j2
index cb749ccf8ea..458c0ef3d02 100644
--- a/dockers/docker-teamd/Dockerfile.j2
+++ b/dockers/docker-teamd/Dockerfile.j2
@@ -10,10 +10,6 @@ RUN apt-get update
 
 RUN apt-get install -f -y libdbus-1-3 libdaemon0 libjansson4 libpython2.7
 
-## Install redis-tools dependencies
-## TODO: implicitly install dependencies
-RUN apt-get -y install libjemalloc1
-
 COPY \
 {% for deb in docker_teamd_debs.split(' ') -%}
 debs/{{ deb }}{{' '}}
diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index 215bdcc3b8e..1bf0552a29d 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -57,6 +57,11 @@ function postStartAction()
             sonic-cfggen -j /etc/sonic/config_db.json --write-to-db
         fi
 
+        if [[ "$BOOT_TYPE" == "fast" ]]; then
+            # set the key to expire in 3 minutes
+            redis-cli -n 6 SET "FAST_REBOOT|system" "1" "EX" "180"
+        fi
+
         redis-cli -n 4 SET "CONFIG_DB_INITIALIZED" "1"
     fi
 
diff --git a/files/scripts/syncd.sh b/files/scripts/syncd.sh
index ef666b78629..2e450e03182 100755
--- a/files/scripts/syncd.sh
+++ b/files/scripts/syncd.sh
@@ -64,7 +64,12 @@ function getBootType()
         TYPE='fastfast'
         ;;
     *SONIC_BOOT_TYPE=fast*|*fast-reboot*)
-        TYPE=$(awk '{ if ($1 <= 180) print "fast"; else print "cold" }' /proc/uptime)
+        # check that the key exists
+        if [[ $(redis-cli -n 6 GET "FAST_REBOOT|system") == "1" ]]; then
+            TYPE='fast'
+        else
+            TYPE='cold'
+        fi
         ;;
     *)
         TYPE='cold'
diff --git a/rules/docker-base.mk b/rules/docker-base.mk
index 8824dfb92eb..a2b567acc35 100644
--- a/rules/docker-base.mk
+++ b/rules/docker-base.mk
@@ -2,7 +2,7 @@
 
 DOCKER_BASE = docker-base.gz
 $(DOCKER_BASE)_PATH = $(DOCKERS_PATH)/docker-base
-$(DOCKER_BASE)_DEPENDS += $(SUPERVISOR)
+$(DOCKER_BASE)_DEPENDS += $(SUPERVISOR) $(REDIS_TOOLS)
 $(DOCKER_BASE)_DEPENDS += $(BASH)
 $(DOCKER_BASE)_DEPENDS += $(SOCAT)
 
diff --git a/src/sonic-quagga b/src/sonic-quagga
index 904a3501077..7101eeda1a1 160000
--- a/src/sonic-quagga
+++ b/src/sonic-quagga
@@ -1 +1 @@
-Subproject commit 904a350107793d44be7167500fcec9087ca3243b
+Subproject commit 7101eeda1a1ccef2e951e4bea5a2f15d9a43e3b5
diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 4b11836f26d..aa092506fb2 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 4b11836f26d3e5d112a9db07f10fc92912bfdf9b
+Subproject commit aa092506fb214b7a70d05e19c0389e8d5b163a21