Merge branch 'cherry' into dev

Version 1.24.0-dev.6.1

Cherry-pick 61300d19c60851fb306656d97e5bea42dcfe0aa8
Cherry-pick a0414390f9652e2b7cd212a0d1501c529946e344
Cherry-pick 03688818fa75bf7d75d91d2016e564d5f2178839
Cherry-pick e9e9835afc4633a0f4bb881c09a5dfb6d14fbc19
diff --git a/tools/VERSION b/tools/VERSION
index 0277ead..d308062 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 24
 PATCH 0
 PRERELEASE 6
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1