diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index 869eaa747448..eec916898d0a 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-cassandra</artifactId>
   <packaging>jar</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite Cassandra</name>
   <description>Cassandra adapter for Calcite</description>
 
diff --git a/core/pom.xml b/core/pom.xml
index 48d7cf280fc0..23e302ab5c8c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-core</artifactId>
   <packaging>jar</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite Core</name>
   <description>Core Calcite APIs and engine.</description>
 
diff --git a/core/src/main/codegen/templates/Parser.jj b/core/src/main/codegen/templates/Parser.jj
index c6a657ff41b8..cb970a6290b8 100644
--- a/core/src/main/codegen/templates/Parser.jj
+++ b/core/src/main/codegen/templates/Parser.jj
@@ -5348,7 +5348,6 @@ SqlPostfixOperator PostfixRowOperator() :
 |   < CONTAINS: "CONTAINS" >
 |   < CONTINUE: "CONTINUE" >
 |   < CONVERT: "CONVERT" >
-|   < CORR: "CORR" >
 |   < CORRESPONDING: "CORRESPONDING" >
 |   < COUNT: "COUNT" >
 |   < COVAR_POP: "COVAR_POP" >
diff --git a/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java b/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
index f132a24cc65a..78e941e2594c 100644
--- a/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
+++ b/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
@@ -163,7 +163,6 @@ public class SqlParserTest {
       "CONTAINS",                      "92",               "2011", "2014", "c",
       "CONTINUE",                      "92", "99", "2003",
       "CONVERT",                       "92",               "2011", "2014", "c",
-      "CORR",                                              "2011", "2014", "c",
       "CORRESPONDING",                 "92", "99", "2003", "2011", "2014", "c",
       "COUNT",                         "92",               "2011", "2014", "c",
       "COVAR_POP",                                         "2011", "2014", "c",
diff --git a/druid/pom.xml b/druid/pom.xml
index 2133cc6e63f2..b538c09357ff 100644
--- a/druid/pom.xml
+++ b/druid/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-druid</artifactId>
   <packaging>jar</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite Druid</name>
   <description>Druid adapter for Calcite</description>
 
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index 90a88de3c350..6ca95b2e8a78 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -21,12 +21,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-elasticsearch</artifactId>
   <packaging>jar</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite Elasticsearch</name>
   <description>Elasticsearch adapter for Calcite</description>
 
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index a7ad4d674216..2b8858f9a351 100644
--- a/example/csv/pom.xml
+++ b/example/csv/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite-example</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-example-csv</artifactId>
   <packaging>jar</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite Example CSV</name>
   <description>An example Calcite provider that reads CSV files</description>
 
diff --git a/example/function/pom.xml b/example/function/pom.xml
index 9d1e4ddf3ab7..5db6d4c74179 100644
--- a/example/function/pom.xml
+++ b/example/function/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite-example</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-example-function</artifactId>
   <packaging>jar</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite Example Function</name>
   <description>Examples of user-defined Calcite functions</description>
 
diff --git a/example/pom.xml b/example/pom.xml
index 52bac8c24124..b73410427785 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -20,13 +20,13 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <!-- The basics. -->
   <artifactId>calcite-example</artifactId>
   <packaging>pom</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite Examples</name>
   <description>Calcite examples</description>
 
diff --git a/file/pom.xml b/file/pom.xml
index a1fd330c48b7..6b67a44c8f3f 100644
--- a/file/pom.xml
+++ b/file/pom.xml
@@ -19,13 +19,13 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <!-- The basics. -->
   <artifactId>calcite-file</artifactId>
   <packaging>jar</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite File</name>
   <description>Calcite provider that reads files and URIs</description>
 
diff --git a/linq4j/pom.xml b/linq4j/pom.xml
index 6bc9b0222269..61960bdd203a 100644
--- a/linq4j/pom.xml
+++ b/linq4j/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-linq4j</artifactId>
   <packaging>jar</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite Linq4j</name>
   <description>Calcite APIs for LINQ (Language-Integrated Query) in Java</description>
 
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index fe868c18f3e0..c8bec820a71a 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-mongodb</artifactId>
   <packaging>jar</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite MongoDB</name>
   <description>MongoDB adapter for Calcite</description>
 
diff --git a/pig/pom.xml b/pig/pom.xml
index 493dd72edc99..748e0881c21d 100644
--- a/pig/pom.xml
+++ b/pig/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-pig</artifactId>
   <packaging>jar</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite Pig</name>
   <description>Pig adapter for Calcite</description>
 
diff --git a/piglet/pom.xml b/piglet/pom.xml
index 1a2f72ab7e21..95dc514aad59 100644
--- a/piglet/pom.xml
+++ b/piglet/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-piglet</artifactId>
   <packaging>jar</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite Piglet</name>
   <description>Pig-like language built on top of Calcite algebra</description>
 
diff --git a/plus/pom.xml b/plus/pom.xml
index dc708a16b8b1..64883b166a97 100644
--- a/plus/pom.xml
+++ b/plus/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-plus</artifactId>
   <packaging>jar</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite Plus</name>
   <description>Miscellaneous extras for Calcite</description>
 
diff --git a/pom.xml b/pom.xml
index 15473b8450d0..0cd88933d762 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <groupId>org.apache.calcite</groupId>
   <artifactId>calcite</artifactId>
   <packaging>pom</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
 
   <!-- More project information. -->
   <name>Calcite</name>
diff --git a/site/_docs/reference.md b/site/_docs/reference.md
index 5c140d4fa9cb..1e263b203984 100644
--- a/site/_docs/reference.md
+++ b/site/_docs/reference.md
@@ -381,7 +381,6 @@ CONSTRUCTOR,
 **CONTAINS**,
 CONTINUE,
 **CONVERT**,
-**CORR**,
 **CORRESPONDING**,
 **COUNT**,
 **COVAR_POP**,
diff --git a/spark/pom.xml b/spark/pom.xml
index decd25078b1f..7df580c5f856 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-spark</artifactId>
   <packaging>jar</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite Spark</name>
 
   <properties>
diff --git a/splunk/pom.xml b/splunk/pom.xml
index 20528e999d47..8f93f42f3bf2 100644
--- a/splunk/pom.xml
+++ b/splunk/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-splunk</artifactId>
   <packaging>jar</packaging>
-  <version>1.13.0-kylin-r3</version>
+  <version>1.13.0-kylin-r4-SNAPSHOT</version>
   <name>Calcite Splunk</name>
   <description>Splunk adapter for Calcite; also a JDBC driver for Splunk</description>
 
diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml
index 521c71135ae0..d98761f76c2d 100644
--- a/ubenchmark/pom.xml
+++ b/ubenchmark/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.13.0-kylin-r3</version>
+    <version>1.13.0-kylin-r4-SNAPSHOT</version>
   </parent>
 
   <properties>