Merge pull request #90409 from atrick/fix-exclusivity-subobject