A commit from the crypto branch