Merge branch 'csum-fixes'