Merge branch '5.8.x' into 6.1.x

.github/workflows/trigger-dependabot-auto-merge-forward.yml

@@ -3,7 +3,7 @@ name: Trigger Dependabot Auto Merge Forward
 on:
   push:
     branches:
-      - '[5-9]+.[0-9]+.x'
+      - '*.x'
 
 permissions: read-all