Fix/soci retries

Merged Simon Morlat requested to merge fix/soci_retries into master

Merge request reports