porting robot tenantId change