Merge branch 't/crypto'