Merge branch 'test-git-local-defaultBranch' into release-3.24

Merge-request: !8060