I don't remember what we did in the code, if we use the patch or changed the code. You can see some more hints here:
https://forum.hibernate.org/viewtopic.php?f=1&t=1009037