diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index d58dfb70b..2f94e6169 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -16,4 +16,4 @@
 # under the License.
 wrapperVersion=3.3.2
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip
diff --git a/README.md b/README.md
index 175e396da..8ec9a93a1 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>2.0.35</version><!-- or later-->
+            <version>2.0.37</version><!-- or later-->
         </dependency>
         <dependency>
           <groupId>javax.servlet</groupId>
@@ -89,7 +89,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>2.0.35</version><!-- or later-->
+            <version>2.0.37</version><!-- or later-->
         </dependency>
         <dependency>
           <groupId>jakarta.servlet</groupId>
@@ -188,7 +188,7 @@ Source code for remote APIs for App Engine.
     <dependency>
        <groupId>com.google.appengine</groupId>
        <artifactId>appengine-remote-api</artifactId>
-       <version>2.0.35</version><!-- Or later-->
+       <version>2.0.37</version><!-- Or later-->
     </dependency>
 ```
 
@@ -211,7 +211,7 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency
     <dependency>
        <groupId>com.google.appengine</groupId>
        <artifactId>appengine-api-legacy.jar/artifactId>
-       <version>2.0.35</version><!-- Or later-->
+       <version>2.0.37</version><!-- Or later-->
     </dependency>
 ```
 
@@ -226,19 +226,19 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-testing</artifactId>
-       <version>2.0.35</version><!-- Or later-->
+       <version>2.0.37</version><!-- Or later-->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-stubs</artifactId>
-       <version>2.0.35</version><!-- Or later-->
+       <version>2.0.37</version><!-- Or later-->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-tools-sdk</artifactId>
-       <version>2.0.35</version><!-- Or later-->
+       <version>2.0.37</version><!-- Or later-->
       <scope>test</scope>
     </dependency>
 ```
diff --git a/TRYLATESTBITSINPROD.md b/TRYLATESTBITSINPROD.md
index 86501954b..35041e2f7 100644
--- a/TRYLATESTBITSINPROD.md
+++ b/TRYLATESTBITSINPROD.md
@@ -46,7 +46,7 @@ top of your web application and change the entrypoint to boot with these jars in
  ./mvnw clean install
 ```
 
-Let's assume the current build version is `2.0.36-SNAPSHOT`.
+Let's assume the current build version is `2.0.38-SNAPSHOT`.
 
 See the output of the runtime deployment module which contains all the jars needed by the runtime:
 
@@ -66,7 +66,7 @@ Add the dependency for the GAE runtime jars in your application pom.xml file:
 
 ```
  <properties>
-        <appengine.runtime.version>2.0.36-SNAPSHOT</appengine.runtime.version>
+        <appengine.runtime.version>2.0.38-SNAPSHOT</appengine.runtime.version>
         <appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
  <properties>
  ...
diff --git a/api/pom.xml b/api/pom.xml
index 37d303bb3..a699e91e1 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>
diff --git a/api_dev/pom.xml b/api_dev/pom.xml
index df86537b1..e8e94f71a 100644
--- a/api_dev/pom.xml
+++ b/api_dev/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/api_legacy/pom.xml b/api_legacy/pom.xml
index a2a2812fb..84d30b1ec 100644
--- a/api_legacy/pom.xml
+++ b/api_legacy/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/appengine-api-1.0-sdk/pom.xml b/appengine-api-1.0-sdk/pom.xml
index 262f4ba93..315fdd394 100644
--- a/appengine-api-1.0-sdk/pom.xml
+++ b/appengine-api-1.0-sdk/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-api-1.0-sdk</name>
diff --git a/appengine-api-stubs/pom.xml b/appengine-api-stubs/pom.xml
index dc6ee9ea0..879f62090 100644
--- a/appengine-api-stubs/pom.xml
+++ b/appengine-api-stubs/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/appengine_init/pom.xml b/appengine_init/pom.xml
index fead941b5..74fabff29 100644
--- a/appengine_init/pom.xml
+++ b/appengine_init/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/appengine_jsr107/pom.xml b/appengine_jsr107/pom.xml
index b09383e80..83d599f39 100644
--- a/appengine_jsr107/pom.xml
+++ b/appengine_jsr107/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/appengine_resources/pom.xml b/appengine_resources/pom.xml
index 93b988c26..0da2c00ab 100644
--- a/appengine_resources/pom.xml
+++ b/appengine_resources/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-resources</name>
diff --git a/appengine_setup/apiserver_local/pom.xml b/appengine_setup/apiserver_local/pom.xml
index b235ba8a6..cd0e439bb 100644
--- a/appengine_setup/apiserver_local/pom.xml
+++ b/appengine_setup/apiserver_local/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>appengine_setup</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/appengine_setup/pom.xml b/appengine_setup/pom.xml
index fd215a330..f8215275c 100644
--- a/appengine_setup/pom.xml
+++ b/appengine_setup/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <modules>
     <module>apiserver_local</module>
diff --git a/appengine_setup/test/pom.xml b/appengine_setup/test/pom.xml
index c8c0f0ba3..2bc1ec1df 100644
--- a/appengine_setup/test/pom.xml
+++ b/appengine_setup/test/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>appengine_setup</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.appengine</groupId>
diff --git a/appengine_setup/test/src/test/java/com/google/appengine/setup/test/Jetty12TestAppTest.java b/appengine_setup/test/src/test/java/com/google/appengine/setup/test/Jetty12TestAppTest.java
index 30ba2420f..2a000c354 100644
--- a/appengine_setup/test/src/test/java/com/google/appengine/setup/test/Jetty12TestAppTest.java
+++ b/appengine_setup/test/src/test/java/com/google/appengine/setup/test/Jetty12TestAppTest.java
@@ -26,6 +26,6 @@ protected String appName() {
     @Override
     protected String relativePathForUserApplicationJar() {
     return "../testapps/jetty12_testapp/target/"
-        + "jetty12_testapp-2.0.36-SNAPSHOT-jar-with-dependencies.jar";
+        + "jetty12_testapp-2.0.38-SNAPSHOT-jar-with-dependencies.jar";
     }
 }
diff --git a/appengine_setup/test/src/test/java/com/google/appengine/setup/test/SpringBootTestAppTest.java b/appengine_setup/test/src/test/java/com/google/appengine/setup/test/SpringBootTestAppTest.java
index 55c065ae9..8f8179c45 100644
--- a/appengine_setup/test/src/test/java/com/google/appengine/setup/test/SpringBootTestAppTest.java
+++ b/appengine_setup/test/src/test/java/com/google/appengine/setup/test/SpringBootTestAppTest.java
@@ -25,6 +25,6 @@ protected String appName() {
 
     @Override
     protected String relativePathForUserApplicationJar() {
-    return "../testapps/springboot_testapp/target/" + "springboot_testapp-2.0.36-SNAPSHOT.jar";
+    return "../testapps/springboot_testapp/target/" + "springboot_testapp-2.0.38-SNAPSHOT.jar";
     }
 }
diff --git a/appengine_setup/test/src/test/java/com/google/appengine/setup/test/util/TestUtil.java b/appengine_setup/test/src/test/java/com/google/appengine/setup/test/util/TestUtil.java
index e1abcd607..1014fb7e0 100644
--- a/appengine_setup/test/src/test/java/com/google/appengine/setup/test/util/TestUtil.java
+++ b/appengine_setup/test/src/test/java/com/google/appengine/setup/test/util/TestUtil.java
@@ -62,7 +62,7 @@ public static HttpClient initializeHttpClient(int timeoutMillis) {
     @SneakyThrows
     public static Process initializeHttpApiServer() {
     String apiServerRelativeJarPath =
-        "../apiserver_local/target/" + "apiserver_local-2.0.36-SNAPSHOT-jar-with-dependencies.jar";
+        "../apiserver_local/target/" + "apiserver_local-2.0.38-SNAPSHOT-jar-with-dependencies.jar";
         File currentDirectory = new File("").getAbsoluteFile();
         File apiServerJar = new File(currentDirectory, apiServerRelativeJarPath);
         ImmutableList<String> processArgs = ImmutableList.<String>builder()
diff --git a/appengine_setup/testapps/jetty12_testapp/pom.xml b/appengine_setup/testapps/jetty12_testapp/pom.xml
index c7ecf36a4..4b084eddc 100644
--- a/appengine_setup/testapps/jetty12_testapp/pom.xml
+++ b/appengine_setup/testapps/jetty12_testapp/pom.xml
@@ -20,20 +20,20 @@
   <parent>
     <artifactId>testapps</artifactId>
     <groupId>com.google.appengine</groupId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.appengine.setup.testapps</groupId>
   <artifactId>jetty12_testapp</artifactId>
   <properties>
-    <jetty.version>12.0.20</jetty.version>
+    <jetty.version>12.0.22</jetty.version>
     <aspectj.version>1.9.24</aspectj.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>com.google.appengine.setup.testapps</groupId>
       <artifactId>testapps_common</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -106,7 +106,7 @@
           <projectId>srirammahavadi-dev</projectId>
           <version>GCLOUD_CONFIG</version>
           <automaticRestart>true</automaticRestart>
-          <artifact>${project.build.directory}/jetty11_testapp-2.0.36-SNAPSHOT-jar-with-dependencies.jar</artifact>
+          <artifact>${project.build.directory}/jetty11_testapp-2.0.38-SNAPSHOT-jar-with-dependencies.jar</artifact>
         </configuration>
       </plugin>
 
diff --git a/appengine_setup/testapps/pom.xml b/appengine_setup/testapps/pom.xml
index ccdcad3bc..8234949c3 100644
--- a/appengine_setup/testapps/pom.xml
+++ b/appengine_setup/testapps/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>appengine_setup</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.appengine</groupId>
diff --git a/appengine_setup/testapps/springboot_testapp/pom.xml b/appengine_setup/testapps/springboot_testapp/pom.xml
index 08abb7169..0ac2308cd 100644
--- a/appengine_setup/testapps/springboot_testapp/pom.xml
+++ b/appengine_setup/testapps/springboot_testapp/pom.xml
@@ -25,7 +25,7 @@
 	</parent>
 	<groupId>com.google.appengine.setup.testapps</groupId>
 	<artifactId>springboot_testapp</artifactId>
-	<version>2.0.36-SNAPSHOT</version>
+	<version>2.0.38-SNAPSHOT</version>
 	<name>springboot_testapp</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
@@ -44,12 +44,12 @@
 		<dependency>
 			<groupId>com.google.appengine</groupId>
 			<artifactId>appengine-api-1.0-sdk</artifactId>
-			<version>2.0.36-SNAPSHOT</version>
+			<version>2.0.38-SNAPSHOT</version>
 		</dependency>
 	 <dependency>
 	  <groupId>com.google.appengine.setup.testapps</groupId>
 	  <artifactId>testapps_common</artifactId>
-	  <version>2.0.36-SNAPSHOT</version>
+	  <version>2.0.38-SNAPSHOT</version>
 	  <type>jar</type>
 	 </dependency>
 	</dependencies>
diff --git a/appengine_setup/testapps/testapps_common/pom.xml b/appengine_setup/testapps/testapps_common/pom.xml
index 4d0e0b210..fcaed6c16 100644
--- a/appengine_setup/testapps/testapps_common/pom.xml
+++ b/appengine_setup/testapps/testapps_common/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>testapps</artifactId>
     <groupId>com.google.appengine</groupId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.appengine.setup.testapps</groupId>
diff --git a/appengine_testing/pom.xml b/appengine_testing/pom.xml
index b71d9f4e9..f3114f6ce 100644
--- a/appengine_testing/pom.xml
+++ b/appengine_testing/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml
index f17df39d4..91fb40817 100644
--- a/appengine_testing_tests/pom.xml
+++ b/appengine_testing_tests/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/applications/pom.xml b/applications/pom.xml
index 7bac0a524..977664a5f 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <properties>
diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml
index 3457aed1c..31c8f41dd 100644
--- a/applications/proberapp/pom.xml
+++ b/applications/proberapp/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>applications</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
     <properties>
@@ -38,7 +38,7 @@
         <DB_REGION>us-central1</DB_REGION>
         <DB_USER>prober-user</DB_USER>
         <DB_PASSOWRD>prober_connectivity_test_database</DB_PASSOWRD>
-        <gax.version>2.64.3</gax.version>
+        <gax.version>2.67.1</gax.version>
         <appengine.target.version>${project.version}</appengine.target.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-spanner</artifactId>
-            <version>6.92.0</version>
+            <version>6.95.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.appengine</groupId>
@@ -116,27 +116,27 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-bigquery</artifactId>
-            <version>2.49.2</version>
+            <version>2.51.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-core</artifactId>
-            <version>2.54.3</version>
+            <version>2.57.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-datastore</artifactId>
-            <version>2.28.0</version>
+            <version>2.29.2</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-logging</artifactId>
-            <version>3.22.2</version>
+            <version>3.22.5</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-storage</artifactId>
-            <version>2.52.1</version>
+            <version>2.53.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud.sql</groupId>
diff --git a/applications/springboot/pom.xml b/applications/springboot/pom.xml
index e25fd2593..659f1c051 100644
--- a/applications/springboot/pom.xml
+++ b/applications/springboot/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>applications</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/devappservertests/pom.xml b/e2etests/devappservertests/pom.xml
index 4f9fabe47..efa7fdc9f 100644
--- a/e2etests/devappservertests/pom.xml
+++ b/e2etests/devappservertests/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>e2etests</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/e2etests/pom.xml b/e2etests/pom.xml
index 3eb2a9ff3..f2cdbc743 100644
--- a/e2etests/pom.xml
+++ b/e2etests/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <name>AppEngine :: e2e tests</name>
   <packaging>pom</packaging>
diff --git a/e2etests/stagingtests/pom.xml b/e2etests/stagingtests/pom.xml
index 0c1604d05..592c77b0e 100644
--- a/e2etests/stagingtests/pom.xml
+++ b/e2etests/stagingtests/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>e2etests</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/e2etests/testlocalapps/allinone/pom.xml b/e2etests/testlocalapps/allinone/pom.xml
index b98eedf55..ef6cc00cc 100644
--- a/e2etests/testlocalapps/allinone/pom.xml
+++ b/e2etests/testlocalapps/allinone/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/allinone_jakarta/pom.xml b/e2etests/testlocalapps/allinone_jakarta/pom.xml
index de8cc30af..725dca99e 100644
--- a/e2etests/testlocalapps/allinone_jakarta/pom.xml
+++ b/e2etests/testlocalapps/allinone_jakarta/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/badcron/pom.xml b/e2etests/testlocalapps/badcron/pom.xml
index 289700919..c6047578e 100644
--- a/e2etests/testlocalapps/badcron/pom.xml
+++ b/e2etests/testlocalapps/badcron/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/bundle_standard/pom.xml b/e2etests/testlocalapps/bundle_standard/pom.xml
index 7f9e9f776..1b98b3281 100644
--- a/e2etests/testlocalapps/bundle_standard/pom.xml
+++ b/e2etests/testlocalapps/bundle_standard/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>testlocalapps</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml b/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml
index c9a6e2994..cd3279fae 100644
--- a/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml
+++ b/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>testlocalapps</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml b/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml
index abf4ae749..2bcb1f042 100644
--- a/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml
+++ b/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>testlocalapps</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml
index 748364915..e07f467a7 100644
--- a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml
+++ b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>testlocalapps</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml
index f54adcee5..21083d03b 100644
--- a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml
+++ b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml
index 7daf86358..caa62b07b 100644
--- a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml
+++ b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml
index 7f6e36038..b3b22acf3 100644
--- a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml
+++ b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml
index a26d303f3..ad24d7026 100644
--- a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml
+++ b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml
index 30a22edc4..a653e5116 100644
--- a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml
+++ b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/http-headers/pom.xml b/e2etests/testlocalapps/http-headers/pom.xml
index 32927ccd7..228642175 100644
--- a/e2etests/testlocalapps/http-headers/pom.xml
+++ b/e2etests/testlocalapps/http-headers/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/java8-jar/pom.xml b/e2etests/testlocalapps/java8-jar/pom.xml
index 7e4a3826a..6d3fe1bc8 100644
--- a/e2etests/testlocalapps/java8-jar/pom.xml
+++ b/e2etests/testlocalapps/java8-jar/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/java8-no-webxml/pom.xml b/e2etests/testlocalapps/java8-no-webxml/pom.xml
index d63bf2114..124a221ee 100644
--- a/e2etests/testlocalapps/java8-no-webxml/pom.xml
+++ b/e2etests/testlocalapps/java8-no-webxml/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/pom.xml b/e2etests/testlocalapps/pom.xml
index 71f3cf8b6..87caa2e2f 100644
--- a/e2etests/testlocalapps/pom.xml
+++ b/e2etests/testlocalapps/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>e2etests</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <properties>
diff --git a/e2etests/testlocalapps/sample-badaeweb/pom.xml b/e2etests/testlocalapps/sample-badaeweb/pom.xml
index 280404b5d..92ebcc1ef 100644
--- a/e2etests/testlocalapps/sample-badaeweb/pom.xml
+++ b/e2etests/testlocalapps/sample-badaeweb/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml
index a33a14523..ddc3f7406 100644
--- a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml
+++ b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-baddispatch/pom.xml b/e2etests/testlocalapps/sample-baddispatch/pom.xml
index 995e16693..b32f3a668 100644
--- a/e2etests/testlocalapps/sample-baddispatch/pom.xml
+++ b/e2etests/testlocalapps/sample-baddispatch/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-badentrypoint/pom.xml b/e2etests/testlocalapps/sample-badentrypoint/pom.xml
index b3acb105c..cf4726461 100644
--- a/e2etests/testlocalapps/sample-badentrypoint/pom.xml
+++ b/e2etests/testlocalapps/sample-badentrypoint/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-badindexes/pom.xml b/e2etests/testlocalapps/sample-badindexes/pom.xml
index 0c8b0255c..6c8d02d08 100644
--- a/e2etests/testlocalapps/sample-badindexes/pom.xml
+++ b/e2etests/testlocalapps/sample-badindexes/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml
index 7e9411dcd..e2d189cbb 100644
--- a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml
+++ b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-badweb/pom.xml b/e2etests/testlocalapps/sample-badweb/pom.xml
index 340052223..919375689 100644
--- a/e2etests/testlocalapps/sample-badweb/pom.xml
+++ b/e2etests/testlocalapps/sample-badweb/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml
index b6ab38651..5e2945140 100644
--- a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml
+++ b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml b/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml
index ee4a2b6fd..99d069bde 100644
--- a/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml
+++ b/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-java11/pom.xml b/e2etests/testlocalapps/sample-java11/pom.xml
index 50de4952b..ffc283b5d 100644
--- a/e2etests/testlocalapps/sample-java11/pom.xml
+++ b/e2etests/testlocalapps/sample-java11/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-java17/pom.xml b/e2etests/testlocalapps/sample-java17/pom.xml
index 510365d7e..725f398bc 100644
--- a/e2etests/testlocalapps/sample-java17/pom.xml
+++ b/e2etests/testlocalapps/sample-java17/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml
index 2855450da..b4ea63d43 100644
--- a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml
+++ b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-jspx/pom.xml b/e2etests/testlocalapps/sample-jspx/pom.xml
index 5bb94bc37..04015858e 100644
--- a/e2etests/testlocalapps/sample-jspx/pom.xml
+++ b/e2etests/testlocalapps/sample-jspx/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml
index c8eb8df50..ebaefbddd 100644
--- a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml
+++ b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-missingappid/pom.xml b/e2etests/testlocalapps/sample-missingappid/pom.xml
index 17bc91244..05376d869 100644
--- a/e2etests/testlocalapps/sample-missingappid/pom.xml
+++ b/e2etests/testlocalapps/sample-missingappid/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-nojsps/pom.xml b/e2etests/testlocalapps/sample-nojsps/pom.xml
index 41e4c9a8e..23388ebeb 100644
--- a/e2etests/testlocalapps/sample-nojsps/pom.xml
+++ b/e2etests/testlocalapps/sample-nojsps/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml
index ce58bc363..56cad4a35 100644
--- a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml
+++ b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sample-with-classes/pom.xml b/e2etests/testlocalapps/sample-with-classes/pom.xml
index ee84c8171..f4646f796 100644
--- a/e2etests/testlocalapps/sample-with-classes/pom.xml
+++ b/e2etests/testlocalapps/sample-with-classes/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml
index ef3c69dbc..13dad7abe 100644
--- a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml
+++ b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sampleapp-backends/pom.xml b/e2etests/testlocalapps/sampleapp-backends/pom.xml
index 94617f864..8fa7a07b5 100644
--- a/e2etests/testlocalapps/sampleapp-backends/pom.xml
+++ b/e2etests/testlocalapps/sampleapp-backends/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
     <name>AppEngine :: sampleapp-backends</name>
diff --git a/e2etests/testlocalapps/sampleapp-basic-module/pom.xml b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml
index afe2d6df2..1bb8822b9 100644
--- a/e2etests/testlocalapps/sampleapp-basic-module/pom.xml
+++ b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml
index 1547b18a8..02becc249 100644
--- a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml
+++ b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sampleapp-runtime/pom.xml b/e2etests/testlocalapps/sampleapp-runtime/pom.xml
index b68c0e025..9dfd23343 100644
--- a/e2etests/testlocalapps/sampleapp-runtime/pom.xml
+++ b/e2etests/testlocalapps/sampleapp-runtime/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/sampleapp/pom.xml b/e2etests/testlocalapps/sampleapp/pom.xml
index b57a95c96..17321218e 100644
--- a/e2etests/testlocalapps/sampleapp/pom.xml
+++ b/e2etests/testlocalapps/sampleapp/pom.xml
@@ -25,7 +25,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <name>AppEngine :: sampleapp</name>
 
diff --git a/e2etests/testlocalapps/stage-sampleapp/pom.xml b/e2etests/testlocalapps/stage-sampleapp/pom.xml
index ccbbd1461..4a846da81 100644
--- a/e2etests/testlocalapps/stage-sampleapp/pom.xml
+++ b/e2etests/testlocalapps/stage-sampleapp/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/stage-with-staging-options/pom.xml b/e2etests/testlocalapps/stage-with-staging-options/pom.xml
index 3b6f36d73..e3e7440b0 100644
--- a/e2etests/testlocalapps/stage-with-staging-options/pom.xml
+++ b/e2etests/testlocalapps/stage-with-staging-options/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/e2etests/testlocalapps/xmlorder/pom.xml b/e2etests/testlocalapps/xmlorder/pom.xml
index 9307092f6..bb6e083e7 100644
--- a/e2etests/testlocalapps/xmlorder/pom.xml
+++ b/e2etests/testlocalapps/xmlorder/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>testlocalapps</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
     <name>AppEngine :: xmlorder</name>
diff --git a/external/geronimo_javamail/pom.xml b/external/geronimo_javamail/pom.xml
index b8b95b0d3..cd50819aa 100644
--- a/external/geronimo_javamail/pom.xml
+++ b/external/geronimo_javamail/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/pom.xml b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/pom.xml
index 3f342942b..9df0dd5b8 100644
--- a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/pom.xml
+++ b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/jetty12_assembly/pom.xml b/jetty12_assembly/pom.xml
index 2222f7eaa..77819e064 100644
--- a/jetty12_assembly/pom.xml
+++ b/jetty12_assembly/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jetty12-assembly</artifactId>
diff --git a/lib/pom.xml b/lib/pom.xml
index add340ee1..6d0001ef6 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
 
diff --git a/lib/tools_api/pom.xml b/lib/tools_api/pom.xml
index 6029154e9..b4140c251 100644
--- a/lib/tools_api/pom.xml
+++ b/lib/tools_api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>lib-parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/lib/xml_validator/pom.xml b/lib/xml_validator/pom.xml
index 269bf7418..179bfffc7 100644
--- a/lib/xml_validator/pom.xml
+++ b/lib/xml_validator/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>lib-parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: libxmlvalidator</name>
diff --git a/lib/xml_validator_test/pom.xml b/lib/xml_validator_test/pom.xml
index d741958e6..16ba6dbf8 100644
--- a/lib/xml_validator_test/pom.xml
+++ b/lib/xml_validator_test/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>lib-parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: libxmlvalidator_test</name>
diff --git a/local_runtime_shared_jetty12/pom.xml b/local_runtime_shared_jetty12/pom.xml
index 877a49d60..c611bfbab 100644
--- a/local_runtime_shared_jetty12/pom.xml
+++ b/local_runtime_shared_jetty12/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-local-runtime-shared Jetty12</name>
diff --git a/local_runtime_shared_jetty9/pom.xml b/local_runtime_shared_jetty9/pom.xml
index ee03b2268..040a7f5c3 100644
--- a/local_runtime_shared_jetty9/pom.xml
+++ b/local_runtime_shared_jetty9/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-local-runtime-shared Jetty9</name>
diff --git a/pom.xml b/pom.xml
index 6d9c7bc7e..87df09848 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.appengine</groupId>
   <artifactId>parent</artifactId>
-  <version>2.0.36-SNAPSHOT</version>
+  <version>2.0.38-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>AppEngine :: Parent project</name>
   <modules>
@@ -65,7 +65,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jetty.version>9.4.57.v20241219</jetty.version>
-    <jetty12.version>12.0.20</jetty12.version>
+    <jetty12.version>12.0.22</jetty12.version>
     <slf4j.version>2.0.17</slf4j.version>
     <distributionManagement.snapshot.url>https://oss.sonatype.org/content/repositories/google-snapshots/</distributionManagement.snapshot.url>
     <distributionManagement.snapshot.id>sonatype-nexus-snapshots</distributionManagement.snapshot.id>
@@ -323,12 +323,12 @@
       <dependency>
          <groupId>com.google.api-client</groupId>
          <artifactId>google-api-client-appengine</artifactId>
-         <version>2.7.2</version>
+         <version>2.8.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client</artifactId>
-        <version>2.7.2</version>
+        <version>2.8.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.appengine</groupId>
@@ -364,7 +364,7 @@
       <dependency>
         <groupId>org.easymock</groupId>
         <artifactId>easymock</artifactId>
-        <version>5.5.0</version>
+        <version>5.6.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.appengine</groupId>
@@ -437,13 +437,13 @@
       <dependency>
         <groupId>com.google.flogger</groupId>
         <artifactId>flogger-system-backend</artifactId>
-        <version>0.8</version>
+        <version>0.9</version>
         <scope>runtime</scope>
       </dependency>
       <dependency>
         <groupId>com.google.flogger</groupId>
         <artifactId>google-extensions</artifactId>
-        <version>0.8</version>
+        <version>0.9</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
@@ -514,7 +514,7 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-core</artifactId>
-        <version>3.9.9</version>
+        <version>3.9.10</version>
       </dependency>
       <dependency>
         <groupId>org.apache.ant</groupId>
@@ -530,7 +530,7 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-api</artifactId>
-        <version>3.9.9</version>
+        <version>3.9.10</version>
       </dependency>
       <dependency>
         <groupId>org.jspecify</groupId>
@@ -603,7 +603,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>2.19.0</version>
+        <version>2.19.1</version>
       </dependency>
       <dependency>
         <groupId>joda-time</groupId>
@@ -649,7 +649,7 @@
        <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-bom</artifactId>
-        <version>5.17.0</version>
+        <version>5.18.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -662,7 +662,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-logging</artifactId>
-        <version>3.22.2</version>
+        <version>3.22.5</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/protobuf/pom.xml b/protobuf/pom.xml
index 2b8794589..82e5211ea 100644
--- a/protobuf/pom.xml
+++ b/protobuf/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/quickstartgenerator/pom.xml b/quickstartgenerator/pom.xml
index ddae417b8..639a82d0a 100644
--- a/quickstartgenerator/pom.xml
+++ b/quickstartgenerator/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/quickstartgenerator_jetty12/pom.xml b/quickstartgenerator_jetty12/pom.xml
index e3d42d306..6ff118e9d 100644
--- a/quickstartgenerator_jetty12/pom.xml
+++ b/quickstartgenerator_jetty12/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/quickstartgenerator_jetty12_ee10/pom.xml b/quickstartgenerator_jetty12_ee10/pom.xml
index 1fb1cc7a0..24749aa88 100644
--- a/quickstartgenerator_jetty12_ee10/pom.xml
+++ b/quickstartgenerator_jetty12_ee10/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/remoteapi/pom.xml b/remoteapi/pom.xml
index 6f7632855..5ea3451f8 100644
--- a/remoteapi/pom.xml
+++ b/remoteapi/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-remote-api</name>
@@ -123,6 +123,14 @@
                   <pattern>com.google.apphosting.datastore.proto2api.DatastoreV3Pb</pattern>
                   <shadedPattern>com.google.apphosting.api.proto2api.DatastorePb</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>com.google.storage.onestore.v3.proto2api</pattern>
+                  <shadedPattern>com.google.appengine.repackaged.com.google.storage.onestore.v3.proto2api</shadedPattern>
+                  </relocation>
+                <relocation>
+                  <pattern>com.google.protobuf</pattern>
+                  <shadedPattern>com.google.appengine.repackaged.com.google.protobuf</shadedPattern>
+                </relocation>
              </relocations>
               <filters>
                 <filter>
diff --git a/runtime/annotationscanningwebapp/pom.xml b/runtime/annotationscanningwebapp/pom.xml
index 15b48388f..3f3ef939d 100644
--- a/runtime/annotationscanningwebapp/pom.xml
+++ b/runtime/annotationscanningwebapp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>runtime-parent</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>annotationscanningwebapp</artifactId>
diff --git a/runtime/deployment/pom.xml b/runtime/deployment/pom.xml
index e4bd33a4b..658a52f98 100644
--- a/runtime/deployment/pom.xml
+++ b/runtime/deployment/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>pom</packaging>
diff --git a/runtime/failinitfilterwebapp/pom.xml b/runtime/failinitfilterwebapp/pom.xml
index a40665073..8eaed2b31 100644
--- a/runtime/failinitfilterwebapp/pom.xml
+++ b/runtime/failinitfilterwebapp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>runtime-parent</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>failinitfilterwebapp</artifactId>
diff --git a/runtime/impl/pom.xml b/runtime/impl/pom.xml
index eccf07a8b..53fa1f5fa 100644
--- a/runtime/impl/pom.xml
+++ b/runtime/impl/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>runtime-parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/runtime/lite/pom.xml b/runtime/lite/pom.xml
index 56e0a3b81..3b8075ddf 100644
--- a/runtime/lite/pom.xml
+++ b/runtime/lite/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>runtime-parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/runtime/local_jetty12/pom.xml b/runtime/local_jetty12/pom.xml
index 1ba63abb7..22cb5ebb0 100644
--- a/runtime/local_jetty12/pom.xml
+++ b/runtime/local_jetty12/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/runtime/local_jetty12_ee10/pom.xml b/runtime/local_jetty12_ee10/pom.xml
index a7bec1f5d..99632f95d 100644
--- a/runtime/local_jetty12_ee10/pom.xml
+++ b/runtime/local_jetty12_ee10/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/runtime/local_jetty9/pom.xml b/runtime/local_jetty9/pom.xml
index 2d2d6081f..c37859e7e 100644
--- a/runtime/local_jetty9/pom.xml
+++ b/runtime/local_jetty9/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/runtime/main/pom.xml b/runtime/main/pom.xml
index 37b656a1c..771ab35a5 100644
--- a/runtime/main/pom.xml
+++ b/runtime/main/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/runtime/nogaeapiswebapp/pom.xml b/runtime/nogaeapiswebapp/pom.xml
index 96874f2f9..d2be57e68 100644
--- a/runtime/nogaeapiswebapp/pom.xml
+++ b/runtime/nogaeapiswebapp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
       <groupId>com.google.appengine</groupId>
       <artifactId>runtime-parent</artifactId>
-      <version>2.0.36-SNAPSHOT</version>
+      <version>2.0.38-SNAPSHOT</version>
     </parent>
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>nogaeapiswebapp</artifactId>
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 5cf82e161..107c1624c 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <name>AppEngine :: runtime projects</name>
   <packaging>pom</packaging>
diff --git a/runtime/runtime_impl_jetty12/pom.xml b/runtime/runtime_impl_jetty12/pom.xml
index 00ccececa..7ff881890 100644
--- a/runtime/runtime_impl_jetty12/pom.xml
+++ b/runtime/runtime_impl_jetty12/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>runtime-parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/runtime/runtime_impl_jetty9/pom.xml b/runtime/runtime_impl_jetty9/pom.xml
index fd2527c06..5f81e860a 100644
--- a/runtime/runtime_impl_jetty9/pom.xml
+++ b/runtime/runtime_impl_jetty9/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>runtime-parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/runtime/test/pom.xml b/runtime/test/pom.xml
index 748af6b31..57e6d78b8 100644
--- a/runtime/test/pom.xml
+++ b/runtime/test/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/runtime/testapps/pom.xml b/runtime/testapps/pom.xml
index b688fb571..be8d08c2a 100644
--- a/runtime/testapps/pom.xml
+++ b/runtime/testapps/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/runtime/util/pom.xml b/runtime/util/pom.xml
index 482e35913..fa306764e 100644
--- a/runtime/util/pom.xml
+++ b/runtime/util/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/runtime_shared/pom.xml b/runtime_shared/pom.xml
index 6659a1a6c..ba062156b 100644
--- a/runtime_shared/pom.xml
+++ b/runtime_shared/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/runtime_shared/src/main/java/com/google/apphosting/api/ApiProxy.java b/runtime_shared/src/main/java/com/google/apphosting/api/ApiProxy.java
index 15dd3c2d3..6d7f0bd3d 100644
--- a/runtime_shared/src/main/java/com/google/apphosting/api/ApiProxy.java
+++ b/runtime_shared/src/main/java/com/google/apphosting/api/ApiProxy.java
@@ -42,6 +42,9 @@ public class ApiProxy {
   private static final String API_DEADLINE_KEY =
       "com.google.apphosting.api.ApiProxy.api_deadline_key";
 
+  private static final String HTTP_CONNECTOR_ENABLED =
+      System.getenv("EXPERIMENT_ENABLE_HTTP_CONNECTOR_FOR_JAVA") != null ? " httpc=on " : "";
+
   /** Store an environment object for each thread. */
   private static final ThreadLocal<Environment> environmentThreadLocal = new ThreadLocal<>();
 
@@ -729,6 +732,11 @@ public interface ApiResultFuture<T> extends Future<T> {
     long getWallclockTimeInMillis();
   }
 
+  /** Returns a debug string indicating if the http connector experiment is enabled. */
+  private static String debugInfo() {
+    return HTTP_CONNECTOR_ENABLED;
+  }
+
   // There isn't much that the client can do about most of these.
   // Making these checked exceptions would just annoy people.
   /** An exception produced when trying to perform an API call. */
@@ -747,15 +755,15 @@ public ApiProxyException(String message, String packageName, String methodName)
 
     private ApiProxyException(
         String message, String packageName, String methodName, Throwable nestedException) {
-      super(String.format(message, packageName, methodName), nestedException);
+      super(String.format(message + debugInfo(), packageName, methodName), nestedException);
     }
 
     public ApiProxyException(String message) {
-      super(message);
+      super(message + debugInfo());
     }
 
     public ApiProxyException(String message, Throwable cause) {
-      super(message, cause);
+      super(message + debugInfo(), cause);
     }
 
     /**
diff --git a/runtime_shared_jetty12/pom.xml b/runtime_shared_jetty12/pom.xml
index 0f745601c..a438f5e6a 100644
--- a/runtime_shared_jetty12/pom.xml
+++ b/runtime_shared_jetty12/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/runtime_shared_jetty12_ee10/pom.xml b/runtime_shared_jetty12_ee10/pom.xml
index 1ad4e7d7b..5410c54fc 100644
--- a/runtime_shared_jetty12_ee10/pom.xml
+++ b/runtime_shared_jetty12_ee10/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/runtime_shared_jetty9/pom.xml b/runtime_shared_jetty9/pom.xml
index 7f5f0539d..e74d72421 100644
--- a/runtime_shared_jetty9/pom.xml
+++ b/runtime_shared_jetty9/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/sdk_assembly/pom.xml b/sdk_assembly/pom.xml
index b90ff5e90..ca3fbfef1 100644
--- a/sdk_assembly/pom.xml
+++ b/sdk_assembly/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>appengine-java-sdk</artifactId>
diff --git a/sessiondata/pom.xml b/sessiondata/pom.xml
index 06f469ab9..01d8249a3 100644
--- a/sessiondata/pom.xml
+++ b/sessiondata/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/shared_sdk/pom.xml b/shared_sdk/pom.xml
index a0036fce7..671950919 100644
--- a/shared_sdk/pom.xml
+++ b/shared_sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/shared_sdk_jetty12/pom.xml b/shared_sdk_jetty12/pom.xml
index 0cb1ae7c3..efea6ca91 100644
--- a/shared_sdk_jetty12/pom.xml
+++ b/shared_sdk_jetty12/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/shared_sdk_jetty9/pom.xml b/shared_sdk_jetty9/pom.xml
index c473721d0..30fa8913b 100644
--- a/shared_sdk_jetty9/pom.xml
+++ b/shared_sdk_jetty9/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.36-SNAPSHOT</version>
+        <version>2.0.38-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/utils/pom.xml b/utils/pom.xml
index c1eddefed..96681e676 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.36-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>