Merge branch 'crypto-review'