Merge "Get rid of useless tenant_id attribiute"