Merge "Crypto performance benchmark" into nyc-dev