SI-7336 - Link flatMapped promises to avoid space leak