Merge branch 'cb/ls-files-cdup' into maint