diff --git a/CHANGELOG.md b/CHANGELOG.md
index 802eb46..6338a5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.3.0-dev.0.4
+
+* Cherry-pick d03323783a5a5a571916457fcf084d103fce86b3 to dev
+* Cherry-pick 14d09498b7830fba62816ec8db3ed9b58601b841 to dev
+
 ## 2.3.0-dev.0.3
 
 * Cherry-pick 04e1b0d976151cc6aa5dcc80667d568c95495c80 to dev
diff --git a/tools/VERSION b/tools/VERSION
index 21d9222..8802673 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -34,6 +34,6 @@
 MINOR 3
 PATCH 0
 PRERELEASE 0
-PRERELEASE_PATCH 3
+PRERELEASE_PATCH 4
 ABI_VERSION 4
 OLDEST_SUPPORTED_ABI_VERSION 1