Avoid timeouts when recounting statistics
Merge pull request #2075 from mahagr/master

Avoid timeouts when recounting statistics