ECL-337 - change to roundrobin with retries