Merge "scenario cross_tenant_connectivity"