Merge branch '6.3.x' into 6.4.x

- codeql uses ubuntu-latest

.github/workflows/codeql.yml

@@ -25,7 +25,7 @@ jobs:
     #   - https://gh.io/supported-runners-and-hardware-resources
     #   - https://gh.io/using-larger-runners (GitHub.com only)
     # Consider using larger runners or machines with greater resources for possible analysis time improvements.
-    runs-on: [self-hosted, Linux, X64, tpe-small-vm]
+    runs-on: ubuntu-latest
     permissions:
       # required for all workflows
       security-events: write