@Andrej I was able to reproduce the issue. I updated the PR to incorporate a test and fix: https://github.com/hibernate/hibernate-orm/pull/2180
We will most probably revert the fix for HHH-11544 Closed in 5.2.15 yet I'd like to ask you to test the PR to verify all edge cases are handled.