Merge branch '3.2.x' into 3.3.x

Closes gh-41866

Author: snicoll

gradle.properties

@@ -15,7 +15,7 @@ kotlinVersion=1.9.25
 mavenVersion=3.9.4
 nativeBuildToolsVersion=0.10.2
 springFrameworkVersion=6.1.12
-springFramework60xVersion=6.0.21
+springFramework60xVersion=6.0.23
 tomcatVersion=10.1.28
 snakeYamlVersion=2.2