[JIRA] (HHH-16298) Failure merging a referenced entity