fix: retry count limit on timeouts
Merge branch 'hotfix_limitTimeout' into NewInfraBranch