Merge branch 'list_panel'