HHH-8947

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