Merge branch 'fc/fast-export-fixes'