Merge "Handling network resources in tenant isolation"