Merge branch 'cb/t5004-empty-tar-archive-fix'