Merge branch '2395_panel_scroll_drag'