HHH-7736 join subclass support