Merge branch 'feature-auto_retry' into 'develop'

Added a default for the retry arg

Small option to add retry by default, also can use the config to set retries now

See merge request !264