Please review branch feature/rm_inject_tenant_id