Version 1.21.0-dev.0.0

Merge bb91445e7e3ec2c74dd6025b31c1c2f2e61daeff into dev
diff --git a/tools/VERSION b/tools/VERSION
index ff9f90a..9cb94bc 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -24,7 +24,7 @@
 #  * Making cherry-picks to stable channel
 #     - increase PATCH by 1
 #
-CHANNEL be
+CHANNEL dev
 MAJOR 1
 MINOR 21
 PATCH 0