[PD-dev] GOP in subpatch