Merge to master: contention over isolate data slots