I guess this was fixed as part of https://github.com/hibernate/hibernate-orm/commit/4a87bc4bb814782eb0f188ccbac7c1023e69e7b9 and https://github.com/hibernate/hibernate-orm/commit/2aece6fb952c1e2be9d7ffb4ea8912a8d2456d33 so I’ll close this now.