Merge "[DO NOT MERGE] Fix flaky test" into tm-dev