Merge branch 'export-try-compile-crash' into release-3.23

Merge-request: !7472