HSEARCH-1638

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