Merge branch '4398-quicview_segfault'