added exponential backoff
Merge commit 'c74835935e4b4d9666f9caab02c3306681141dbf' into HEAD