Steve Ebersole if you think the PR https://github.com/hibernate/hibernate-orm/pull/1361 is good it can go in 5.2