[PD] same extra patch for different pd versions