Merge branch '5.0' into merge-4.8-into-5.0-1738872281639

Author: rustagir

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,4 +7,3 @@ This will help reviewers and should be a good start for the documentation.
 
 - [ ] Add tests and ensure they pass
 - [ ] Add an entry to the CHANGELOG.md file
-- [ ] Update documentation for new features

.github/workflows/merge-up.yml

@@ -3,7 +3,7 @@ name: Merge up
 on:
   push:
     branches:
-      - "[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9x]+"
 
 env:
   GH_TOKEN: ${{ secrets.MERGE_UP_TOKEN }}
@@ -28,4 +28,5 @@ jobs:
         with:
           ref: ${{ github.ref_name }}
           branchNamePattern: '<major>.<minor>'
+          devBranchNamePattern: '<major>.x'
           enableAutoMerge: true