SI-7336 - Link flatMapped promises to avoid memory leaks
Merge pull request #2674 from richdougherty/2.10.x-si7336-try2

SI-7336 Link flatMapped promises to avoid memory leaks