Merge branch 'ep-git-update-commit-ref' into release-3.20

Merge-request: !6249