Merge remote-tracking branch 'upstream/r/18.x' into develop

Author: Arnei

.github/workflows/crowdin-upload-keys.yml

@@ -26,4 +26,4 @@ jobs:
       env:
         CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
       run: |
-        crowdin upload sources --config .crowdin.yaml -b main
+        crowdin upload sources --config .crowdin.yaml -b "${GITHUB_REF##*/}"