Merge "ignore a flaky test" into sc-dev