Version 2.18.0-21.0.dev

Merge commit '61a4d7ef68f98186d924fb8499b34c4b93e1b07e' into 'dev'
diff --git a/tools/VERSION b/tools/VERSION
index 4a27978..3e0b84e 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -23,9 +23,9 @@
 #  * Making cherry-picks to stable channel
 #     - increase PATCH by 1
 #
-CHANNEL be
+CHANNEL dev
 MAJOR 2
 MINOR 18
 PATCH 0
-PRERELEASE 0
-PRERELEASE_PATCH 0
+PRERELEASE 21
+PRERELEASE_PATCH 0
\ No newline at end of file