The following pull requests ultimately ended up being for HHH-9796 (not this issue):

• https://github.com/hibernate/hibernate-orm/pull/953
• https://github.com/hibernate/hibernate-orm/pull/953