Merge branch '1982_segfault_on_gz_archive'