[hibernate-issues] [JIRA] (HHH-13856) TODO fixed and done as an improvement