[#1564] add retry and timeout per suggestion