Merged crypt branch