HHH-7736 union-subclass support