Version 2.1.0-dev.9.4

Cherry-pick e23acaaf90996b84548ea23af14730ff1a21d826 to dev
Cherry-pick e6d3a45b6a98ea36581ac375ec5cdd63dd829004 to dev
Cherry-pick a40fd6a976d3d3bc341cd2e0f7fb290b7819a52a to dev
Cherry-pick 9eb1d748819530bb3eb2f78699e0968de8b638fe to dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54bc2bc..6ef0c56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 2.1.0-dev.9.4
+
+Cherry-pick e23acaaf90996b84548ea23af14730ff1a21d826 to dev
+
+Cherry-pick e6d3a45b6a98ea36581ac375ec5cdd63dd829004 to dev
+
+Cherry-pick a40fd6a976d3d3bc341cd2e0f7fb290b7819a52a to dev
+
+Cherry-pick 9eb1d748819530bb3eb2f78699e0968de8b638fe to dev
+
 # 2.1.0-dev.9.3
 
 Cherry-pick 65951ef5080bcfa7d8862685e96f75c2c5d17841 to dev
diff --git a/tools/VERSION b/tools/VERSION
index fe36fde..5361581 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 1
 PATCH 0
 PRERELEASE 9
-PRERELEASE_PATCH 3
+PRERELEASE_PATCH 4