diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37ef962..54f3532 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.1.1-dev.0.0
+
+* Cherry-pick f8a680e5116493f8795c148a52dbecf8a84e4536 to dev
+* Cherry-pick b1c963c84b20e715bc5c1f7d443168071c2b971d to dev
+
 ## 2.2.0-dev.1.1
 
 ### Tool Changes
diff --git a/tools/VERSION b/tools/VERSION
index 146c6cc..3677e8b 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -25,7 +25,7 @@
 #
 CHANNEL dev
 MAJOR 2
-MINOR 2
-PATCH 0
-PRERELEASE 1
-PRERELEASE_PATCH 1
+MINOR 1
+PATCH 1
+PRERELEASE 0
+PRERELEASE_PATCH 0