Merge branch 'net-data-races'