Fix index contamination problem during batch saves.
Rename @Owner to @Container (and all relevant terminology)