Packet creation error merged back in

Merge conflict resolution