Merge branch 'tg/ls-files-debug-format-fix'