HSEARCH-1620

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