diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index dfd30a1a5..59713c0a8 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -20,11 +20,13 @@ on:
     branches:
     - master
     - 'envoy-release/**'
+    - 'istio-release/**'
 
   push:
     branches:
     - master
     - 'envoy-release/**'
+    - 'istio-release/**'
 
 jobs:
 
diff --git a/src/context.cc b/src/context.cc
index 89daa97a4..c33027e1e 100644
--- a/src/context.cc
+++ b/src/context.cc
@@ -629,6 +629,12 @@ FilterHeadersStatus ContextBase::convertVmCallResultToFilterHeadersStatus(uint64
       result > static_cast<uint64_t>(FilterHeadersStatus::StopAllIterationAndWatermark)) {
     return FilterHeadersStatus::StopAllIterationAndWatermark;
   }
+  if (result == static_cast<uint64_t>(FilterHeadersStatus::StopIteration)) {
+    // Always convert StopIteration (pause processing headers, but continue processing body)
+    // to StopAllIterationAndWatermark (pause all processing), since the former breaks all
+    // assumptions about HTTP processing.
+    return FilterHeadersStatus::StopAllIterationAndWatermark;
+  }
   return static_cast<FilterHeadersStatus>(result);
 }