Pdi 12187 rebased