Tried my best, but this is pretty hard to implement and requires many changes to how the UnionSubclassEntityPersister works. Maybe someone else can give this a try. I'll add a testcase PR that will cover the problematic aspects I discovered while trying to implement this.