Merge branch 'dt/untracked-sparse'