Merge branch '3.4.x' into 3.5.x

Closes gh-46069

Author: philwebb

gradle.properties

@@ -12,7 +12,7 @@ commonsCodecVersion=1.18.0
 graalVersion=22.3
 hamcrestVersion=3.0
 jacksonVersion=2.19.1
-javaFormatVersion=0.0.43
+javaFormatVersion=0.0.47
 junitJupiterVersion=5.12.2
 kotlinVersion=1.9.25
 mavenVersion=3.9.10