Merge branch '1973_segfault_panel_format'