Merge branch 'rs/sha1-array-test'