Merge branch 'dt/clean-pathspec-filter-then-lstat' into maint