GPII-941: PCP now sends payload according to format