Fix Baseclass becomes! subclass.
Merge pull request #14971 from versioncontrol/#14785

Baseclass becomes! subclass