Version 2.4.0-dev.0.0

* Cherry-pick 73e2f469f8e312c256fa657b3b9868c90fe5b31c to dev
* Cherry-pick 9b55e3027a56129be5fdc4d06125ebe2355ab0d4 to dev
diff --git a/tools/VERSION b/tools/VERSION
index 402a566..c5d7094 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -31,8 +31,8 @@
 #
 CHANNEL dev
 MAJOR 2
-MINOR 3
-PATCH 3
+MINOR 4
+PATCH 0
 PRERELEASE 0
 PRERELEASE_PATCH 0
 ABI_VERSION 5