Merge branch 'checksums' into 1.8