Steve Ebersole I've created https://github.com/hibernate/hibernate-orm/pull/2223 with these additions.