Merge branch 'export-target-lang-name' into release-3.16

Merge-request: !3927