Follow up on tenantOverride