Merge branch 'aix-exe-exports' into release-3.21

Merge-request: !7120