Version 2.8.4

* Cherry-pick 857fca710fd7b75e5595e198d5fb723f077b4563 to stable
* Cherry-pick 4246b82425e402ad70b5ff48ccd2de00654926a3 to stable
* Cherry-pick 099415b8b87432bfb5559b193f8062c8e790e839 to stable
diff --git a/tools/VERSION b/tools/VERSION
index b4b0afc..eb95ae4 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -32,7 +32,7 @@
 CHANNEL stable
 MAJOR 2
 MINOR 8
-PATCH 3
+PATCH 4
 PRERELEASE 0
 PRERELEASE_PATCH 0
 ABI_VERSION 32