Re: merge upstream crypt changes