Merge "Add a first chance retry delay of 1s." into sc-dev