Merge branch 'UseSWIG-create-workingdir' into release-3.21

Merge-request: !6750