Merge branch 'upgrade_crypto' into 'develop'