Add more timings for export performance
Merge branch 'master' into staging