Merge branch 'inet_csums_part2'