Merge "Ignore flaky tests" into sc-dev