Merge branch 'net-avoid-KCSAN-splats'