PR https://github.com/hibernate/hibernate-orm/pull/1156

Steve Ebersole can you give a look at it.

Thanks