Merge branch 'fc/fast-export-persistent-marks'