HSEARCH-1637

 - https://hibernate.atlassian.net/browse/HSEARCH-1637