Use a new containers-resolver (AST-74985)

Use a new containers-resolver (AST-74985) #3963