Merge "Make sure isolated tenants are not left behind."