The fix is in theory done, we are just discussing details. Would be very grateful if you could test it: https://github.com/hibernate/hibernate-orm/pull/2180