Added support for container restart