HHH-8945

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