HSEARCH-1463

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