Merge branch 'no-git-version' into release-3.16

Merge-request: !3910