Merge branch 'test-git-local-defaultBranch'

Merge-request: !8060