Encoding payload size
Merge branch 'encoding_payload_size'