Merge branch 'jk/maint-1.6.3-ls-files-i' into maint