HHH-19374, HHH-19375, HHH-19425 backport to 6.6#10060

gavinking merged 3 commits intohibernate:6.6hibernate/hibernate-orm:6.6from

gavinking:HHH-19374-backportgavinking/hibernate-orm:HHH-19374-backportCopy head branch name to clipboard