Version 2.1.1-dev.3.1

* Cherry-pick 46080dd886a622c5520895d49c97506ecedb1df8 to dev
* Cherry-pick fc62cf037343248c5ace87629d8eb1063f9f2428 to dev
* Cherry-pick 770ab5275ac34af62d7c39da8eac8c56fdc48edb to dev
* Cherry-pick 957e194735bda4fcf06cdcc68fa80f3290b17d79 to dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5f621a..7e0cef2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2.1.1-dev.3.1
+
+* Cherry-pick 46080dd886a622c5520895d49c97506ecedb1df8 to dev
+* Cherry-pick fc62cf037343248c5ace87629d8eb1063f9f2428 to dev
+* Cherry-pick 770ab5275ac34af62d7c39da8eac8c56fdc48edb to dev
+* Cherry-pick 957e194735bda4fcf06cdcc68fa80f3290b17d79 to dev
+
 ## 2.1.1-dev.3.0
 
 * Cherry-pick 3cb16d20e7810a2a378bb897d939f67c0b380d88 to dev
diff --git a/tools/VERSION b/tools/VERSION
index 3457917..f1ad7f9 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 1
 PATCH 1
 PRERELEASE 3
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1