Merge "Replace deprecated tenant_id property"