Merge pull request #13955 from colemanw/Promise