Version 2.12.2

* Cherry-pick 937a716b095c4803750ed5013706cccd07dc613c to stable
* Cherry-pick cc0966948745a563a25ff69590971ee0fffa64da to stable
diff --git a/tools/VERSION b/tools/VERSION
index 7b54af4..ec4c8b7 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
 CHANNEL stable
 MAJOR 2
 MINOR 12
-PATCH 1
+PATCH 2
 PRERELEASE 0
 PRERELEASE_PATCH 0
\ No newline at end of file