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