Merge branch '2858_mcview_html_segfault'