Merge branch 'test-git-protocol-file' into release-3.24

Merge-request: !7812