AI-664  : added support to keep multiple containers at the same time