Changed wait from 50 to 100 for flaky promise test.
Merge remote-tracking branch 'upstream/dev-3.x' into dev-3.x