HSEARCH-1648

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