SM-13565 container management update