Closes TMSS-418 This continues the work from TMSS-408 on a new branch. Please review !353 (merged) first.