Pdi 11848 dialog backport