Merge branch 'jc/ls-files-i-dir' into maint