Fixes #5030: Invalid promises generated for distributePolicy as of #5025
Merge pull request #414 from jooooooon/bug_5030/invalid_promises_generated_for_distributepolicy_as_of_5025

Bug 5030/invalid promises generated for distributepolicy as of 5025