Merge branch '3.1.x' into 3.2.x

Closes gh-39336

Author: mhalbritter

.github/workflows/build-pull-request.yml

@@ -23,7 +23,7 @@ jobs:
         uses: gradle/wrapper-validation-action@v1
 
       - name: Set up Gradle
-        uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2
+        uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa
 
       - name: Build
         env: