Merge "Retry on unavailable." into sc-dev