Pdi 12423 backport