This fixes #7899.  A base class was created.