Merge branch 'jk/simplify-csum-file-sha1fd-check' into maint