Merge branch 'net-packet-data-races'