Merge branch 'feature/tenant_view' into develop