HSEARCH-1728

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