Improve the export speed
Merge branch 'feature-export' into develop