I guess this was fixed as part of https://github.com/hibernate/hibernate-orm/commit/ae978b3d10fa77da691c7751764edc97062fe5b3 and https://github.com/hibernate/hibernate-orm/commit/a9414fa6be224bed717baf5df6b2347359f159b2 so I’ll close this.