Merge "Fix flaky tests (3/n)"