Merge branch 'ef/fast-export'