[hibernate-issues] [JIRA] (BVAL-668) Address Guillaume's review remarks