CMS-3309 Flatten promise pyramids