Merge branch 'di/fast-import-ident'