Version 2.12.4

* Cherry-pick bed058967673986153bfd965772c4032e706befe to stable
* Cherry-pick 83ed095505aa2209f3677ddb0d2d79fa8ffa1eeb to stable
diff --git a/tools/VERSION b/tools/VERSION
index 6f1acdf..194dc0e 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
 CHANNEL stable
 MAJOR 2
 MINOR 12
-PATCH 3
+PATCH 4
 PRERELEASE 0
 PRERELEASE_PATCH 0
\ No newline at end of file