I created a combined PR for HHH-10558 Open and HHH-13393 Open - https://github.com/hibernate/hibernate-orm/pull/2859