Merge branch 'dt/tree-fsck'