Merge "Fix flaky/broken test" into sc-dev