Merge branch 'spaeth/import_identity'