Version 1.23.0-dev.11.4

Cherry-pick ae22eed515a7855ee3bba3c031faab8332a5c0f4 into dev
Cherry-pick e121d95b1b168a50942a874d66247a3ff72ff892 into dev
diff --git a/tools/VERSION b/tools/VERSION
index d829f83..f52ff92 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 23
 PATCH 0
 PRERELEASE 11
-PRERELEASE_PATCH 3
+PRERELEASE_PATCH 4