I created a pull request for HHH-6865. IMO, this should be fixed for the next CR. https://hibernate.onjira.com/browse/HHH-6865 https://github.com/hibernate/hibernate-core/pull/232 Please take a look and merge if it looks OK. Thanks, Gail