Merge branch 'nd/ls-files-sparse-fix'