Merge branch 'crypto'. Yes!