Version 2.2.1-dev.0.0

* Cherry-pick 6f8415245d4dd298730facf83e03de69fc29bbd3 to dev
* Cherry-pick e7d263b05f7f66d15f778df60ee60625e9a3c5f4 to dev
* Cherry-pick dc8a56bc0ece296915c7016e0a8241c7068eca18 to dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 237f3a3..263f5b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.2.1-dev.0.0
+
+* Cherry-pick 6f8415245d4dd298730facf83e03de69fc29bbd3 to dev
+* Cherry-pick e7d263b05f7f66d15f778df60ee60625e9a3c5f4 to dev
+* Cherry-pick dc8a56bc0ece296915c7016e0a8241c7068eca18 to dev
+
 ## 2.2.0-dev.2.1
 
 * Cherry-pick 765e6338a803ee17472b1fa715ffcfbd4ea46bfb to dev
diff --git a/tools/VERSION b/tools/VERSION
index 4c8c6f5..0226fc7 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
 CHANNEL dev
 MAJOR 2
 MINOR 2
-PATCH 0
-PRERELEASE 2
-PRERELEASE_PATCH 1
+PATCH 1
+PRERELEASE 0
+PRERELEASE_PATCH 0