Add an assertion to ensure that router rebuilds set the proper tenant_id

....