This issue can be closed as a duplicate of https://hibernate.atlassian.net/browse/HHH-15648. I’ve verified the attached case and it passes with 6.1.6-SNAPSHOT.