AP11-214 changes in header parsing