Merge branch '2919_dlg_as_widget'