Merge branch 'sb/sha1-file-cleanup' into maint