Merge "Fix race conditions between containers"