Merge branch 'ma/fast-export-skip-merge-fix'