Merge branch '3021_segfault_unowned_temp_dir'