Version 2.16.1

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