Merge "Revert "DO NOT MERGE: Modify the pseudo-header checksum functions."" into klp-dev