Here is my proposed fix : https://github.com/lalmeras/hibernate-orm/tree/HHH-11815
From hibernate-orm@master, first commit add a new test case that trigger this issue. Second commit is my proposed fix.
My test case go from FAILED to PASS with this commit.

(I already apply to the contributor agreement a few years ago, and I can rework my pull-request if needed).