#59594846 - merge two classes