HSEARCH-1225

https://hibernate.onjira.com/browse/HSEARCH-1225