merging from upstream "Addition of correct back-off behaviour for full-hash requests"