Merge "fix usage of allow_tenant_isolation"