Use checksum by default
Merge branch 'use-checksum'