Make packet argument deterministic
Merge branch 'dev' into monitor-dev

so we get the packet changes 'n stuff
Fix packet argument orders