Merge branch 'ak/t4151-ls-files-could-be-empty' into maint