Merge branch 'jk/sha1-file-reduce-useless-warnings' into maint