HHH-7803 switched to using classmate for resolving entity field types