add timeout retry
Merge branch 'develop'