Encapsulate EquivalenceClass
into a struct
#8034
Merged
EquivalenceClass
into a struct
#8034