HHH-8968 - 4.3 - Regression test and bug fix

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