HHH-9217

This is a pull request for this issue:
https://hibernate.atlassian.net/browse/HHH-9217