Merge pull request #2007 from alexzayats/patch-retry-handler

Merge pull request #2007 from alexzayats/patch-retry-handler #3497