Merge "Remove CredentialHash serialization"