Sorry! I thought I posted this in HHH-8732.

But now that I have this in conversation. Should HHH-8732 be part of this upgrade? Looks like HibernateUtil has some references to older Terracotta Classes.