Merge branch '3.1.x'

Closes gh-36563

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

@@ -37,6 +37,7 @@ jobs:
 
       - name: Upload build reports
         uses: actions/upload-artifact@v3
+        if: failure()
         with:
           name: build-reports
           path: '**/build/reports/'