Mike/current tenants migration

Merge request reports