Added fields to export.
Merge branch 'master' into develop