Merge "Fix infinite loop in GenerateIdentityHashCode"