Merge changes to SimpleDataImportExport to master