Merge branch '2783_panel_dir_fix' into 4.8.1-stable