Merge "Add num_retries configuration option"