Resolve "advanced retry strategy"

Merged lukas leufen requested to merge lukas_issue453_refac_advanced-retry-strategy into develop

Closes #453 (closed)

Merge request reports