Merge branch 'packet-fixes'