diff --git a/files/scripts/syncd.sh b/files/scripts/syncd.sh
index d4536b4d8b94..0c3be805e7d6 100755
--- a/files/scripts/syncd.sh
+++ b/files/scripts/syncd.sh
@@ -64,7 +64,7 @@ function getBootType()
         TYPE='fastfast'
         ;;
     *SONIC_BOOT_TYPE=fast*|*fast-reboot*)
-        TYPE='fast'
+        TYPE=$(awk '{ if ($1 <= 180) print "fast"; else print "cold" }' /proc/uptime)
         ;;
     *)
         TYPE='cold'
diff --git a/src/sonic-quagga b/src/sonic-quagga
index b1d01a2dd841..904a35010779 160000
--- a/src/sonic-quagga
+++ b/src/sonic-quagga
@@ -1 +1 @@
-Subproject commit b1d01a2dd841f76e73067171702f7c6321793c49
+Subproject commit 904a350107793d44be7167500fcec9087ca3243b