Submerge 3.7.8

- Fixed a rare bug on macOS Monterey where the export could fail under certain conditions.