[hibernate-issues] [Hibernate-JIRA] (HV-761) Align with BV API CR2 changes