HCANN-65

https://hibernate.atlassian.net/browse/HCANN-65