Merge "Reducing the timeout of an individual pass." into sc-dev