Merge "Improve CryptoHelper" into nyc-dev