HHH-8946

https://hibernate.atlassian.net/browse/HHH-8946