diff --git a/presto-native-execution/presto_cpp/main/functions/tests/FunctionMetadataTest.cpp b/presto-native-execution/presto_cpp/main/functions/tests/FunctionMetadataTest.cpp
index 98aa31222eccb..39f500d241459 100644
--- a/presto-native-execution/presto_cpp/main/functions/tests/FunctionMetadataTest.cpp
+++ b/presto-native-execution/presto_cpp/main/functions/tests/FunctionMetadataTest.cpp
@@ -103,7 +103,7 @@ TEST_F(FunctionMetadataTest, elementAt) {
 }
 
 TEST_F(FunctionMetadataTest, greatest) {
-  testFunction("greatest", "Greatest.json", 13);
+  testFunction("greatest", "Greatest.json", 15);
 }
 
 TEST_F(FunctionMetadataTest, lead) {
diff --git a/presto-native-execution/presto_cpp/main/functions/tests/data/Greatest.json b/presto-native-execution/presto_cpp/main/functions/tests/data/Greatest.json
index 8952199ae5059..46c646d88276c 100644
--- a/presto-native-execution/presto_cpp/main/functions/tests/data/Greatest.json
+++ b/presto-native-execution/presto_cpp/main/functions/tests/data/Greatest.json
@@ -193,6 +193,36 @@
             "schema":"default",
             "typeVariableConstraints":[],
             "variableArity":true
+        },
+        {
+            "docString":"presto.default.greatest",
+            "functionKind":"SCALAR",
+            "longVariableConstraints":[],
+            "outputType":"time",
+            "paramTypes":["time","time"],
+            "routineCharacteristics": {
+                "determinism":"DETERMINISTIC",
+                "language":"CPP",
+                "nullCallClause":"RETURNS_NULL_ON_NULL_INPUT"
+            },
+            "schema":"default",
+            "typeVariableConstraints":[],
+            "variableArity":true
+        },
+        {
+            "docString":"presto.default.greatest",
+            "functionKind":"SCALAR",
+            "longVariableConstraints":[],
+            "outputType":"time with time zone",
+            "paramTypes":["time with time zone","time with time zone"],
+            "routineCharacteristics": {
+                "determinism":"DETERMINISTIC",
+                "language":"CPP",
+                "nullCallClause":"RETURNS_NULL_ON_NULL_INPUT"
+            },
+            "schema":"default",
+            "typeVariableConstraints":[],
+            "variableArity":true
         }
     ]
 }
diff --git a/presto-native-execution/velox b/presto-native-execution/velox
index 6cfdded639923..528da3f8b39b5 160000
--- a/presto-native-execution/velox
+++ b/presto-native-execution/velox
@@ -1 +1 @@
-Subproject commit 6cfdded6399233615f33088f2b037f8d2c505e1a
+Subproject commit 528da3f8b39b5d3c36747b5d3afc45db00c9a126