Hsearch 1719

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