PR based on Steve Ebersole review of the previous one https://github.com/hibernate/hibernate-orm/pull/1026