Merge branch '4561_tar_segfault'