HSEARCH-1463

https://hibernate.atlassian.net/browse/HSEARCH-1463

If this change is ok, then please also merge HSEARCH-1463-4.5 in branch 4.5