diff --git a/presto-native-execution/presto_cpp/main/QueryContextManager.cpp b/presto-native-execution/presto_cpp/main/QueryContextManager.cpp
index 0c5abdd952855..f5bc90391369d 100644
--- a/presto-native-execution/presto_cpp/main/QueryContextManager.cpp
+++ b/presto-native-execution/presto_cpp/main/QueryContextManager.cpp
@@ -35,7 +35,6 @@ std::string toVeloxConfig(const std::string& name) {
            QueryConfig::kAggregationSpillMemoryThreshold},
           {"native_simplified_expression_evaluation_enabled",
            QueryConfig::kExprEvalSimplified},
-          {"native_aggregation_spill_all", QueryConfig::kAggregationSpillAll},
           {"native_join_spill_memory_threshold",
            QueryConfig::kJoinSpillMemoryThreshold},
           {"native_order_by_spill_memory_threshold",
diff --git a/presto-native-execution/presto_cpp/main/tests/PrestoExchangeSourceTest.cpp b/presto-native-execution/presto_cpp/main/tests/PrestoExchangeSourceTest.cpp
index 18c24a784acb3..0c0a5525f73be 100644
--- a/presto-native-execution/presto_cpp/main/tests/PrestoExchangeSourceTest.cpp
+++ b/presto-native-execution/presto_cpp/main/tests/PrestoExchangeSourceTest.cpp
@@ -325,25 +325,26 @@ std::unique_ptr<exec::SerializedPage> waitForNextPage(
     const std::shared_ptr<exec::ExchangeQueue>& queue) {
   bool atEnd;
   facebook::velox::ContinueFuture future;
-  auto page = queue->dequeueLocked(&atEnd, &future);
+  auto pages = queue->dequeueLocked(1, &atEnd, &future);
+  EXPECT_LE(pages.size(), 1);
   EXPECT_FALSE(atEnd);
-  if (page == nullptr) {
+  if (pages.empty()) {
     std::move(future).get();
-    page = queue->dequeueLocked(&atEnd, &future);
-    EXPECT_TRUE(page != nullptr);
+    pages = queue->dequeueLocked(1, &atEnd, &future);
+    EXPECT_EQ(pages.size(), 1);
   }
-  return page;
+  return std::move(pages.front());
 }
 
 void waitForEndMarker(const std::shared_ptr<exec::ExchangeQueue>& queue) {
   bool atEnd;
   facebook::velox::ContinueFuture future;
-  auto page = queue->dequeueLocked(&atEnd, &future);
-  ASSERT_TRUE(page == nullptr);
+  auto pages = queue->dequeueLocked(1, &atEnd, &future);
+  ASSERT_TRUE(pages.empty());
   if (!atEnd) {
     std::move(future).get();
-    page = queue->dequeueLocked(&atEnd, &future);
-    ASSERT_TRUE(page == nullptr);
+    pages = queue->dequeueLocked(1, &atEnd, &future);
+    ASSERT_TRUE(pages.empty());
     ASSERT_TRUE(atEnd);
   }
 }
diff --git a/presto-native-execution/presto_cpp/main/tests/QueryContextManagerTest.cpp b/presto-native-execution/presto_cpp/main/tests/QueryContextManagerTest.cpp
index 001170495b72a..5245f4649b276 100644
--- a/presto-native-execution/presto_cpp/main/tests/QueryContextManagerTest.cpp
+++ b/presto-native-execution/presto_cpp/main/tests/QueryContextManagerTest.cpp
@@ -54,7 +54,6 @@ TEST_F(QueryContextManagerTest, nativeSessionProperties) {
   EXPECT_FALSE(queryCtx->queryConfig().joinSpillEnabled());
   EXPECT_TRUE(queryCtx->queryConfig().validateOutputFromOperators());
   EXPECT_EQ(queryCtx->queryConfig().spillWriteBufferSize(), 1024);
-  EXPECT_TRUE(queryCtx->queryConfig().aggregationSpillAll());
 }
 
 TEST_F(QueryContextManagerTest, defaultSessionProperties) {
@@ -67,7 +66,6 @@ TEST_F(QueryContextManagerTest, defaultSessionProperties) {
   EXPECT_TRUE(queryCtx->queryConfig().joinSpillEnabled());
   EXPECT_FALSE(queryCtx->queryConfig().validateOutputFromOperators());
   EXPECT_EQ(queryCtx->queryConfig().spillWriteBufferSize(), 1L << 20);
-  EXPECT_TRUE(queryCtx->queryConfig().aggregationSpillAll());
 }
 
 } // namespace facebook::presto
diff --git a/presto-native-execution/velox b/presto-native-execution/velox
index c11f1b374cc3c..8ff8d7a0e83b8 160000
--- a/presto-native-execution/velox
+++ b/presto-native-execution/velox
@@ -1 +1 @@
-Subproject commit c11f1b374cc3c559d2dd27800907f3d0855f2b6c
+Subproject commit 8ff8d7a0e83b862456c4830249c3f3e9f51110eb