Merge branch '3.0.x' into 3.1.x

Closes gh-36570

Author: wilkinsona

.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@bd5760595778326ba7f1441bcf7e88b49de61a25
+        uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c
 
       - name: Build
         env: