This also resolve a possible race condition - a next stage should not
start until are retries are done in a previous one.