Fixes #14458 - use a base class for STI taxable objects
(cherry picked from commit d96297b17f55469e3c49c90979cbd004d80f461c)
Fixes #14458 - use a base class for STI taxable objects
(cherry picked from commit d96297b17f55469e3c49c90979cbd004d80f461c)