Version 2.1.1-dev.3.0

* Cherry-pick 3cb16d20e7810a2a378bb897d939f67c0b380d88 to dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 910c41c..f5f621a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.1-dev.3.0
+
+* Cherry-pick 3cb16d20e7810a2a378bb897d939f67c0b380d88 to dev
+
 ## 2.1.1-dev.2.0
 
 ### Core library changes
diff --git a/tools/VERSION b/tools/VERSION
index 9e72048..3457917 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
 MAJOR 2
 MINOR 1
 PATCH 1
-PRERELEASE 2
+PRERELEASE 3
 PRERELEASE_PATCH 0