[PD] PDP patches