Merge branch 'ad/sha1-update-chunked' into maint