Branch: refs/heads/5.3 Home: https://github.com/hibernate/hibernate-orm Commit: 631a2645a88d3f0b5709b3992b5899ca0de7b7e1 https://github.com/hibernate/hibernate-orm/commit/631a2645a88d3f0b5709b39... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2019-09-03 (Tue, 03 Sep 2019) Changed paths: M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java Log Message: ----------- HHH-13590 : TransientObjectException merging a non-proxy association to a proxy (cherry picked from commit 148b4b2ed009b488206b8e3854bc7270dc7931b4)