OC-1130: Change the old dialog by the new dialog.