HHH-9074

@sebersole as I promised test case for https://hibernate.atlassian.net/browse/HHH-9074