Merge branch 'dt/untracked-subdir' into maint