Merge branch 'sha2-no-trunc'