IDEX-1323: use DialogFactory