GPII-1015: Adjustments to headers for PCP