Merge "Container restart loop"