diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml
index f0fe03b8f4f75..6eb4038ae2932 100644
--- a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml
+++ b/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml
@@ -1028,8 +1028,8 @@
 ---
 "delimited_payload_filter":
     - skip:
-        version: " - 6.99.99"
-        reason:  AwaitsFix, https://github.com/elastic/elasticsearch/issues/31422. delimited_payload_filter deprecated in 6.2, replaced by delimited_payload
+        version: " - 6.1.99"
+        reason: delimited_payload_filter deprecated in 6.2, replaced by delimited_payload
         features: "warnings"
 
     - do:
diff --git a/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java
index 2543be4811c1e..8927adfd43458 100644
--- a/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java
@@ -730,7 +730,7 @@ public <T> void submitStateUpdateTasks(final String source,
             return;
         }
         final ThreadContext threadContext = threadPool.getThreadContext();
-        final Supplier<ThreadContext.StoredContext> supplier = threadContext.newRestorableContext(false);
+        final Supplier<ThreadContext.StoredContext> supplier = threadContext.newRestorableContext(true);
         try (ThreadContext.StoredContext ignore = threadContext.stashContext()) {
             threadContext.markAsSystemContext();