Merge "Fix Cipher doc."