Fixes #10025 - move generic taxonomies code to base class
(cherry picked from commit bf75590c49c05dd780df388908598c85fc8f53bd)
Fixes #10025 - move generic taxonomies code to base class
(cherry picked from commit bf75590c49c05dd780df388908598c85fc8f53bd)