Merge branch '2817_dlg_mouse_fix'