Merge branch '1794_treeview_segfault'