diff --git a/docs/src/modules/java-protobuf/pages/index.adoc b/docs/src/modules/java-protobuf/pages/index.adoc
index f83d398c41..e34dbef0a7 100644
--- a/docs/src/modules/java-protobuf/pages/index.adoc
+++ b/docs/src/modules/java-protobuf/pages/index.adoc
@@ -60,7 +60,7 @@ Scala::
 [.group-scala]
 [source,scala,subs="attributes+"]
 ----
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 enablePlugins(KalixPlugin)
 ----
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index abff19e8db..b30e23bccf 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -14,8 +14,8 @@ object Dependencies {
   }
 
   // changing the Scala version of the Java SDK affects end users
-  val ScalaVersion = "2.13.12"
-  val ScalaVersionForTooling = "2.12.18"
+  val ScalaVersion = "2.13.13"
+  val ScalaVersionForTooling = "2.12.19"
 
   val ProtobufVersion = // akka.grpc.gen.BuildInfo.googleProtobufVersion
     "3.21.12" // explicitly overriding the 3.21.1 version from Akka gRPC 2.1.6 (even though its build says 3.20.1)
diff --git a/samples/scala-protobuf-customer-registry-quickstart/build.sbt b/samples/scala-protobuf-customer-registry-quickstart/build.sbt
index 2801f640bd..f1e30858bf 100644
--- a/samples/scala-protobuf-customer-registry-quickstart/build.sbt
+++ b/samples/scala-protobuf-customer-registry-quickstart/build.sbt
@@ -4,7 +4,7 @@ organization := "customer"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-doc-snippets/build.sbt b/samples/scala-protobuf-doc-snippets/build.sbt
index 9804704570..060216dacc 100644
--- a/samples/scala-protobuf-doc-snippets/build.sbt
+++ b/samples/scala-protobuf-doc-snippets/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-eventsourced-counter/build.sbt b/samples/scala-protobuf-eventsourced-counter/build.sbt
index 73b8cf141e..7245a369b2 100644
--- a/samples/scala-protobuf-eventsourced-counter/build.sbt
+++ b/samples/scala-protobuf-eventsourced-counter/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-eventsourced-customer-registry-subscriber/build.sbt b/samples/scala-protobuf-eventsourced-customer-registry-subscriber/build.sbt
index 3ff4fbb895..87024a0911 100644
--- a/samples/scala-protobuf-eventsourced-customer-registry-subscriber/build.sbt
+++ b/samples/scala-protobuf-eventsourced-customer-registry-subscriber/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-eventsourced-customer-registry/build.sbt b/samples/scala-protobuf-eventsourced-customer-registry/build.sbt
index b56a697a3c..6969c3ad47 100644
--- a/samples/scala-protobuf-eventsourced-customer-registry/build.sbt
+++ b/samples/scala-protobuf-eventsourced-customer-registry/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-eventsourced-shopping-cart/build.sbt b/samples/scala-protobuf-eventsourced-shopping-cart/build.sbt
index 3324d41156..c049100903 100644
--- a/samples/scala-protobuf-eventsourced-shopping-cart/build.sbt
+++ b/samples/scala-protobuf-eventsourced-shopping-cart/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-fibonacci-action/build.sbt b/samples/scala-protobuf-fibonacci-action/build.sbt
index 1a2a5c3ae1..6f1095a523 100644
--- a/samples/scala-protobuf-fibonacci-action/build.sbt
+++ b/samples/scala-protobuf-fibonacci-action/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-first-service/build.sbt b/samples/scala-protobuf-first-service/build.sbt
index 42bf80c056..1a3d054f77 100644
--- a/samples/scala-protobuf-first-service/build.sbt
+++ b/samples/scala-protobuf-first-service/build.sbt
@@ -1,6 +1,6 @@
 organization := "com.example"
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-reliable-timers/build.sbt b/samples/scala-protobuf-reliable-timers/build.sbt
index b0bb20d330..d0f94cedf6 100644
--- a/samples/scala-protobuf-reliable-timers/build.sbt
+++ b/samples/scala-protobuf-reliable-timers/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-replicatedentity-examples/build.sbt b/samples/scala-protobuf-replicatedentity-examples/build.sbt
index dafee32462..1427eaf438 100644
--- a/samples/scala-protobuf-replicatedentity-examples/build.sbt
+++ b/samples/scala-protobuf-replicatedentity-examples/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-replicatedentity-shopping-cart/build.sbt b/samples/scala-protobuf-replicatedentity-shopping-cart/build.sbt
index 9e4d1529dc..a6671e945f 100644
--- a/samples/scala-protobuf-replicatedentity-shopping-cart/build.sbt
+++ b/samples/scala-protobuf-replicatedentity-shopping-cart/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-tracing/build.sbt b/samples/scala-protobuf-tracing/build.sbt
index 4b562a4e3c..7c644508e9 100644
--- a/samples/scala-protobuf-tracing/build.sbt
+++ b/samples/scala-protobuf-tracing/build.sbt
@@ -1,6 +1,6 @@
 organization := "com.example"
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 
 enablePlugins(KalixPlugin, JavaAppPackaging, DockerPlugin)
diff --git a/samples/scala-protobuf-transfer-workflow-compensation/build.sbt b/samples/scala-protobuf-transfer-workflow-compensation/build.sbt
index b66820bbc1..410cea342a 100644
--- a/samples/scala-protobuf-transfer-workflow-compensation/build.sbt
+++ b/samples/scala-protobuf-transfer-workflow-compensation/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-transfer-workflow/build.sbt b/samples/scala-protobuf-transfer-workflow/build.sbt
index 8368b389c9..54534f2f2a 100644
--- a/samples/scala-protobuf-transfer-workflow/build.sbt
+++ b/samples/scala-protobuf-transfer-workflow/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-valueentity-counter/build.sbt b/samples/scala-protobuf-valueentity-counter/build.sbt
index d48f020c9c..fc4e6e3315 100644
--- a/samples/scala-protobuf-valueentity-counter/build.sbt
+++ b/samples/scala-protobuf-valueentity-counter/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-valueentity-customer-registry/build.sbt b/samples/scala-protobuf-valueentity-customer-registry/build.sbt
index 9dd2b1e18e..2ae7b73301 100644
--- a/samples/scala-protobuf-valueentity-customer-registry/build.sbt
+++ b/samples/scala-protobuf-valueentity-customer-registry/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-valueentity-shopping-cart/build.sbt b/samples/scala-protobuf-valueentity-shopping-cart/build.sbt
index 64064a12db..09fe2ed472 100644
--- a/samples/scala-protobuf-valueentity-shopping-cart/build.sbt
+++ b/samples/scala-protobuf-valueentity-shopping-cart/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-view-store/build.sbt b/samples/scala-protobuf-view-store/build.sbt
index fc9ca8dd22..91f44adeaf 100644
--- a/samples/scala-protobuf-view-store/build.sbt
+++ b/samples/scala-protobuf-view-store/build.sbt
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
 organizationHomepage := Some(url("https://kalix.io"))
 licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/samples/scala-protobuf-web-resources/build.sbt b/samples/scala-protobuf-web-resources/build.sbt
index becb4e9244..1c1e2a5819 100644
--- a/samples/scala-protobuf-web-resources/build.sbt
+++ b/samples/scala-protobuf-web-resources/build.sbt
@@ -1,6 +1,6 @@
 organization := "com.example"
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
diff --git a/sbt-plugin/src/sbt-test/sbt-kalix/compile-only/build.sbt b/sbt-plugin/src/sbt-test/sbt-kalix/compile-only/build.sbt
index 900c13f6f4..6f61822a63 100644
--- a/sbt-plugin/src/sbt-test/sbt-kalix/compile-only/build.sbt
+++ b/sbt-plugin/src/sbt-test/sbt-kalix/compile-only/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 enablePlugins(KalixPlugin)
 
diff --git a/sbt-plugin/src/sbt-test/sbt-kalix/eventsourcedentity/build.sbt b/sbt-plugin/src/sbt-test/sbt-kalix/eventsourcedentity/build.sbt
index 103454de07..0ff66f2594 100644
--- a/sbt-plugin/src/sbt-test/sbt-kalix/eventsourcedentity/build.sbt
+++ b/sbt-plugin/src/sbt-test/sbt-kalix/eventsourcedentity/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 enablePlugins(KalixPlugin)
 
diff --git a/sbt-plugin/src/sbt-test/sbt-kalix/no-common-pkg-root/build.sbt b/sbt-plugin/src/sbt-test/sbt-kalix/no-common-pkg-root/build.sbt
index 900c13f6f4..6f61822a63 100644
--- a/sbt-plugin/src/sbt-test/sbt-kalix/no-common-pkg-root/build.sbt
+++ b/sbt-plugin/src/sbt-test/sbt-kalix/no-common-pkg-root/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 enablePlugins(KalixPlugin)
 
diff --git a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/http/HttpEndpointMethodDefinition.scala b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/http/HttpEndpointMethodDefinition.scala
index 7918ae5980..e2e2043360 100644
--- a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/http/HttpEndpointMethodDefinition.scala
+++ b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/http/HttpEndpointMethodDefinition.scala
@@ -19,6 +19,7 @@ import akka.http.scaladsl.model.HttpMethods
 import akka.http.scaladsl.model.IllegalRequestException
 import akka.http.scaladsl.model.ParsingException
 import akka.http.scaladsl.model.RequestEntityAcceptance
+import akka.http.scaladsl.model.StatusCode
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.model.Uri.Path
 import com.google.api.HttpRule.PatternCase
@@ -62,11 +63,13 @@ object HttpEndpointMethodDefinition {
   private type ExtractPathParameters = (Matcher, PathParameterEffect) => Unit
 
   // This is used to support the "*" custom pattern
-  val ANY_METHOD = HttpMethod.custom(
-    name = "ANY",
-    safe = false,
-    idempotent = false,
-    requestEntityAcceptance = RequestEntityAcceptance.Tolerated)
+  val ANY_METHOD =
+    HttpMethod(
+      "ANY",
+      isSafe = false,
+      isIdempotent = false,
+      requestEntityAcceptance = RequestEntityAcceptance.Tolerated,
+      contentLengthAllowed = (forStatus: StatusCode) => forStatus.intValue < 200 || forStatus.intValue >= 300)
 
   /**
    * INTERNAL API