Changed tenantId to default_project_id as per review.