Merge "HeaderDeserializer and HeaderSerializer for codecs"