Merge branch 'en/fast-export-fix'