[JBTM-1931] inject TM instead of looking it up as a resource
Merge branch 'JBTM-1931'