Merge branch '2390_panel_format_init'