TMSS-1554: This is still a sub-optimal solution, but we first want to get TBB running with TMSS as is. Closes TMSS-1554