Steve Ebersole Should we also merge https://github.com/hibernate/hibernate-orm/pull/2298? As the bug that this issue represents is still broken. I added a new test for the bug.