Merge "v5: use add{Packet|Data}Offset() in the code for better documentation" into main