Hsearch 1360

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