Merge "Refactor TenantManage"