Francisco Alejandro Lozano López or William Webb, can either you give the PR changes in https://github.com/hibernate/hibernate-orm/pull/3170 a try and let me know if that truly solves your issues? The test case provided by Francisco passes, but would like to be sure we've covered all bases.