Merge branch 'di/fast-import-deltified-tree'