[PD] subpatches