Merge branch '2677_viewer_double_dialog'