The fix for HHH-12436 Resolved (correctly) changed the AssociationKey for a one-to-one association to be the same as the AssociationKey of the parent entity while building load plans. Hibernate incorrectly assumes that the one-to-one association is a duplicate association. As a result, Hibernate uses FetchMode.SELECT to load the one-to-one association.

This issue will deal with this special case where the parent entity is the EntityReturn. It will change the association back to use FetchMode.JOIN.