[hibernate-issues] [JIRA] (BVAL-639) Address Emmanuel's review remarks