Merge branch 'UseSWIG-legacy-user-flags' into release-3.12

Merge-request: !2245