The following commit does not apply to this issue; applies to HHH-9965 Closed instead: https://github.com/hibernate/hibernate-orm/commit/b711e14a6c1897ae95263eed21e697644b876489