Fix .tm test
Merge branch 'tm-support' into develop