Version 2.10.4

* Cherry-pick da133e5047e0fb447af20cd142fc0cf8363487e6 to stable
* Cherry-pick ff1f611f3eb7c3c58a3a3536ee41816d31acb2bc to stable
diff --git a/tools/VERSION b/tools/VERSION
index baf9ffe..16def66 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
 CHANNEL stable
 MAJOR 2
 MINOR 10
-PATCH 3
+PATCH 4
 PRERELEASE 0
 PRERELEASE_PATCH 0