Merge "Fix broken test" into tm-dev