HHH-9186

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