Merge branch 'tb/collect-pack-filenames-fix'