Merge "Reexport operator!= overloads in the derived type to avoid ambiguous base class lookups" into main