Hey Steve Ebersole, in the meantime, have a look at Timo Kankare's PR? https://github.com/hibernate/hibernate-orm/pull/1336 Unless you think otherwise, it looks directly mergeable...