Merge branch 'cherry-pick-for-450' into 'release/0.19'

Cherry-pick 'Adding retry for 502 and 503 bad gateway error' into release/0.19

See merge request !476