Merge branch '2783_panel_dir_fix'