Merge branch 'csum_fixes'