comment indicating that tenantId can be null.