Merge branch '4598_tar_segfault'