Use container.Lock in public ToDisk method Upstream-commit: c3f247860aa169f4a9530d025da935d71af72f20 Component: engine