Merge branch 'di/fast-import-blob-tweak'