pause/retry tweak: as still getting some timeout and connection errors
Merge origin/master