TMSS-142: Closes TMSS-142 and TMSS-141
TMSS-141 was only a very minor task which I included in this TMSS-142 branch.