Attempt to improve export performance
Merge branch 'master' into staging