Merge branch 'export-properties-undefined' into release-3.12

Merge-request: !2294