Merge "Add aditional waiter for TF case" into mcp/caracal