Merge branch 'restore-target-export-includes' into release-3.22

Merge-request: !6969