Merge branch 'refs/heads/t/sha3' into master