Merge "Retry on signal." into sc-dev