Changed message senders to use the global packet size
Merge conflicts