Merge branch 'jc/ls-files-killed-optim' into maint