diff --git a/cpp/velox/substrait/SubstraitToVeloxPlan.cc b/cpp/velox/substrait/SubstraitToVeloxPlan.cc
index 1b1ee1f49353..b20b4a3d0901 100644
--- a/cpp/velox/substrait/SubstraitToVeloxPlan.cc
+++ b/cpp/velox/substrait/SubstraitToVeloxPlan.cc
@@ -464,7 +464,7 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
 
   // Get the grouping expressions.
   VELOX_CHECK(
-    aggRel.groupings().size() <= 1, "At most one grouping is supported, but got {}.", aggRel.groupings().size());
+      aggRel.groupings().size() <= 1, "At most one grouping is supported, but got {}.", aggRel.groupings().size());
   if (aggRel.groupings().size() == 1) {
     for (const auto& groupingExpr : aggRel.groupings()[0].grouping_expressions()) {
       // Velox's groupings are limited to be Field.
@@ -504,7 +504,6 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
     aggregates.emplace_back(core::AggregationNode::Aggregate{aggExpr, rawInputTypes, mask, {}, {}});
   }
 
-  bool ignoreNullKeys = false;
   std::vector<core::FieldAccessTypedExprPtr> preGroupingExprs;
   if (aggRel.has_advanced_extension() &&
       SubstraitParser::configSetInOptimization(aggRel.advanced_extension(), "isStreaming=")) {
@@ -526,7 +525,8 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
       preGroupingExprs,
       aggOutNames,
       aggregates,
-      ignoreNullKeys,
+      /*ignoreNullKeys=*/false,
+      /*noGroupsSpanBatches=*/false,
       childNode);
 
   if (aggRel.has_common()) {
@@ -904,10 +904,9 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
         (std::dynamic_pointer_cast<const core::ProjectNode>(childNode) != nullptr ||
          std::dynamic_pointer_cast<const ValueStreamNode>(childNode) != nullptr)
 #ifdef GLUTEN_ENABLE_GPU
-        || std::dynamic_pointer_cast<const CudfValueStreamNode>(childNode) != nullptr
+            || std::dynamic_pointer_cast<const CudfValueStreamNode>(childNode) != nullptr
 #endif
-          &&
-            childNode->outputType()->size() > requiredChildOutput.size(),
+                && childNode->outputType()->size() > requiredChildOutput.size(),
         "injectedProject is true, but the ProjectNode or ValueStreamNode (in case of projection fallback)"
         " is missing or does not have the corresponding projection field");
 
@@ -1653,9 +1652,13 @@ bool SubstraitToVeloxPlanConverter::checkTypeExtension(const ::substrait::Plan&
 }
 
 #ifdef GLUTEN_ENABLE_GPU
-template core::PlanNodePtr SubstraitToVeloxPlanConverter::constructValueStreamNode<CudfValueStreamNode>(const ::substrait::ReadRel& sRead, int32_t streamIdx);
+template core::PlanNodePtr SubstraitToVeloxPlanConverter::constructValueStreamNode<CudfValueStreamNode>(
+    const ::substrait::ReadRel& sRead,
+    int32_t streamIdx);
 #endif
 
-template core::PlanNodePtr SubstraitToVeloxPlanConverter::constructValueStreamNode<ValueStreamNode>(const ::substrait::ReadRel& sRead, int32_t streamIdx);
+template core::PlanNodePtr SubstraitToVeloxPlanConverter::constructValueStreamNode<ValueStreamNode>(
+    const ::substrait::ReadRel& sRead,
+    int32_t streamIdx);
 
 } // namespace gluten
diff --git a/ep/build-velox/src/get-velox.sh b/ep/build-velox/src/get-velox.sh
index 14070294bdb6..1f5eaa7ee4be 100755
--- a/ep/build-velox/src/get-velox.sh
+++ b/ep/build-velox/src/get-velox.sh
@@ -18,8 +18,8 @@ set -exu
 
 CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
 VELOX_REPO=https://github.com/IBM/velox.git
-VELOX_BRANCH=dft-2026_01_16
-VELOX_ENHANCED_BRANCH=ibm-2026_01_16
+VELOX_BRANCH=dft-2026_01_19
+VELOX_ENHANCED_BRANCH=ibm-2026_01_19
 VELOX_HOME=""
 RUN_SETUP_SCRIPT=ON
 ENABLE_ENHANCED_FEATURES=OFF