Sleep to mitigate bug 26467 in the 3.4.x series.
Merge bug26470
stable to default