Support API Call retries
Merge branch 'api-retry'