Merge branch '3.1.x' into 3.2.x

Author: wilkinsona

.github/workflows/build-and-deploy-snapshot.yml

@@ -71,7 +71,7 @@ jobs:
   verify:
     name: Verify
     needs: build-and-deploy-snapshot
-    uses: .github/workflows/verify.yml
+    uses: ./.github/workflows/verify.yml
     secrets: inherit
     with:
       version: ${{ needs.build-and-deploy-snapshot.outputs.version }}