Version 2.1.2-dev.0.0
Merge commit '011a1239fc4c0ed140ddce4773cc791da1936cd4' into dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50e71af..dc9f141 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,27 @@
-## 2.1.1-dev.XX.0
-(Add new changes here, and they will be copied to the change section for the
- next dev version)
+## 2.1.2-dev.0.0
-### Language
+* Merge commit 011a1239fc4c0ed140ddce4773cc791da1936cd4 into dev
+
+## 2.1.1
+
+* Identical to 2.1.1-dev.3.2
+
+## 2.1.1-dev.3.2
+
+* Cherry-pick 9d25cc93e850d4717cdc9e1c4bd3623e09c16d47 to dev
+
+## 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
+
+## 2.1.1-dev.2.0
### Core library changes
diff --git a/tools/VERSION b/tools/VERSION
index 7579d0d..e753a82 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -23,9 +23,9 @@
# * Making cherry-picks to stable channel
# - increase PATCH by 1
#
-CHANNEL be
+CHANNEL dev
MAJOR 2
-MINOR 2
-PATCH 0
+MINOR 1
+PATCH 2
PRERELEASE 0
PRERELEASE_PATCH 0
