Segfault resolution commit #1
Segfault resolution commit #2