Merge "Fixes flaky tests" into tm-dev