I’ve managed to come up with a patch for the Hibernate 6.1 branch (as this is what we’re using) that fixes the test cases in the issue. What are the next steps?

hibernate-fix.patch