HHH-7736 join subclass support
HHH-7736 join subclass support