Gail Badner, I fixed this as part of HHH-12320 Open since both required the same fix and the other was reported prior. You can find the PR at https://github.com/hibernate/hibernate-orm/pull/2566. Thanks!.