Update to handle p0 format under patch apply