[NHSP-17] - NHibernate JIRA