Version 2.16.2

* Cherry-pick refs/changes/41/238041/1 to stable
* Cherry-pick a999d2182c2f3f2fbceee96d616639c345d45108 to stable
diff --git a/tools/VERSION b/tools/VERSION
index 9be6324..e7ef658 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
 CHANNEL stable
 MAJOR 2
 MINOR 16
-PATCH 1
+PATCH 2
 PRERELEASE 0
 PRERELEASE_PATCH 0
\ No newline at end of file