Merge "Tighter equals/hashCode method checking."