Merge branch 'crypto' into 'master'