diff --git a/cve-suppressions.xml b/cve-suppressions.xml
index 1d3fa1652..e6ecd6ea2 100644
--- a/cve-suppressions.xml
+++ b/cve-suppressions.xml
@@ -28,13 +28,13 @@
         <cve>CVE-2022-38750</cve>
         <cve>CVE-2022-25857</cve>
         <cve>CVE-2022-38749</cve>
-        <cve>CVE-2021-37533</cve>
-        <cve>CVE-2022-41854</cve>
-        <cve>CVE-2022-1471</cve>
-        <cve>CVE-2021-4277</cve>
-        <cve>CVE-2022-3064</cve>
-        <cve>CVE-2021-4235</cve>
-        <cve>CVE-2022-45688</cve>
+	<cve>CVE-2021-37533</cve>
+	<cve>CVE-2022-41854</cve>
+	<cve>CVE-2022-1471</cve>
+	<cve>CVE-2021-4277</cve>
+	<cve>CVE-2022-3064</cve>
+	<cve>CVE-2021-4235</cve>
+	<cve>CVE-2022-45688</cve>
         <cve>CVE-2020-8908</cve>
     </suppress>
 
diff --git a/pom.xml b/pom.xml
index 928ef6112..33152d7b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.zalando</groupId>
     <artifactId>riptide</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Riptide</name>
diff --git a/riptide-auth/pom.xml b/riptide-auth/pom.xml
index 89ae9c074..a5427a40c 100644
--- a/riptide-auth/pom.xml
+++ b/riptide-auth/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-bom/pom.xml b/riptide-bom/pom.xml
index b17f7d7a5..df8da5b7d 100644
--- a/riptide-bom/pom.xml
+++ b/riptide-bom/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>riptide-bom</artifactId>
@@ -21,97 +21,97 @@
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-auth</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-capture</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-chaos</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-compatibility</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-concurrent</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-core</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-failsafe</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-faults</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-httpclient</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-idempotency</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-logbook</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-micrometer</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-opentracing</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-opentelemetry</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-problem</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-soap</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-spring-boot-autoconfigure</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-spring-boot-starter</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>riptide-stream</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.1-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/riptide-capture/pom.xml b/riptide-capture/pom.xml
index b708f2132..f5ad289b8 100644
--- a/riptide-capture/pom.xml
+++ b/riptide-capture/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-chaos/pom.xml b/riptide-chaos/pom.xml
index f9587b59e..0b4cb5289 100644
--- a/riptide-chaos/pom.xml
+++ b/riptide-chaos/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-compatibility/pom.xml b/riptide-compatibility/pom.xml
index 1cfcd40f2..7dbb986b4 100644
--- a/riptide-compatibility/pom.xml
+++ b/riptide-compatibility/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-compression/pom.xml b/riptide-compression/pom.xml
index c343e2330..5d862ec5f 100644
--- a/riptide-compression/pom.xml
+++ b/riptide-compression/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-concurrent/pom.xml b/riptide-concurrent/pom.xml
index 087ab0653..7fd936662 100644
--- a/riptide-concurrent/pom.xml
+++ b/riptide-concurrent/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-core/pom.xml b/riptide-core/pom.xml
index e42331a71..5bda79408 100644
--- a/riptide-core/pom.xml
+++ b/riptide-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-failsafe/pom.xml b/riptide-failsafe/pom.xml
index 591474fc6..bef38cc31 100644
--- a/riptide-failsafe/pom.xml
+++ b/riptide-failsafe/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-faults/pom.xml b/riptide-faults/pom.xml
index b0bb098ff..2857afc82 100644
--- a/riptide-faults/pom.xml
+++ b/riptide-faults/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-httpclient/pom.xml b/riptide-httpclient/pom.xml
index 20b843257..a72c94a29 100644
--- a/riptide-httpclient/pom.xml
+++ b/riptide-httpclient/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-idempotency/pom.xml b/riptide-idempotency/pom.xml
index cb1706d26..919628867 100644
--- a/riptide-idempotency/pom.xml
+++ b/riptide-idempotency/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-logbook/pom.xml b/riptide-logbook/pom.xml
index d9ce1d367..b8c61ec13 100644
--- a/riptide-logbook/pom.xml
+++ b/riptide-logbook/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-micrometer/pom.xml b/riptide-micrometer/pom.xml
index fdebf9d72..3384c523e 100644
--- a/riptide-micrometer/pom.xml
+++ b/riptide-micrometer/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-opentelemetry/pom.xml b/riptide-opentelemetry/pom.xml
index 9f697bdcd..0cce62df0 100644
--- a/riptide-opentelemetry/pom.xml
+++ b/riptide-opentelemetry/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-opentracing/pom.xml b/riptide-opentracing/pom.xml
index dea1c3ff5..4119bebd3 100644
--- a/riptide-opentracing/pom.xml
+++ b/riptide-opentracing/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-opentracing/src/main/java/org/zalando/riptide/opentracing/span/ServiceLoaderSpanDecorator.java b/riptide-opentracing/src/main/java/org/zalando/riptide/opentracing/span/ServiceLoaderSpanDecorator.java
index 086715e50..011ca6de1 100644
--- a/riptide-opentracing/src/main/java/org/zalando/riptide/opentracing/span/ServiceLoaderSpanDecorator.java
+++ b/riptide-opentracing/src/main/java/org/zalando/riptide/opentracing/span/ServiceLoaderSpanDecorator.java
@@ -4,6 +4,7 @@
 
 import java.util.List;
 import java.util.ServiceLoader;
+import java.util.stream.Collectors;
 
 import static java.util.ServiceLoader.load;
 import static java.util.stream.StreamSupport.stream;
diff --git a/riptide-parent/pom.xml b/riptide-parent/pom.xml
index 1bdcbb29f..f2d3881d1 100644
--- a/riptide-parent/pom.xml
+++ b/riptide-parent/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>riptide-parent</artifactId>
diff --git a/riptide-problem/pom.xml b/riptide-problem/pom.xml
index 3e3950e2e..b69fdfefb 100644
--- a/riptide-problem/pom.xml
+++ b/riptide-problem/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-soap/pom.xml b/riptide-soap/pom.xml
index fe4f6c082..fb6f4cf3f 100644
--- a/riptide-soap/pom.xml
+++ b/riptide-soap/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-spring-boot-autoconfigure/pom.xml b/riptide-spring-boot-autoconfigure/pom.xml
index ff7ecd81d..ee863c807 100644
--- a/riptide-spring-boot-autoconfigure/pom.xml
+++ b/riptide-spring-boot-autoconfigure/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-spring-boot-starter/pom.xml b/riptide-spring-boot-starter/pom.xml
index 69a405ae8..6c3193dd3 100644
--- a/riptide-spring-boot-starter/pom.xml
+++ b/riptide-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>
 
diff --git a/riptide-stream/pom.xml b/riptide-stream/pom.xml
index 0028a63f9..7b0fe1d58 100644
--- a/riptide-stream/pom.xml
+++ b/riptide-stream/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>riptide-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../riptide-parent</relativePath>
     </parent>