diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6338a5f..1c596d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.3.0-dev.0.5
+
+* Cherry-pick 347b72c260949fa96ec5a45f3d6b1e2388ea245a to dev
+
 ## 2.3.0-dev.0.4
 
 * Cherry-pick d03323783a5a5a571916457fcf084d103fce86b3 to dev
diff --git a/tools/VERSION b/tools/VERSION
index 8802673..3cbb7b3 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -34,6 +34,6 @@
 MINOR 3
 PATCH 0
 PRERELEASE 0
-PRERELEASE_PATCH 4
+PRERELEASE_PATCH 5
 ABI_VERSION 4
 OLDEST_SUPPORTED_ABI_VERSION 1