Closes TMSS-2104, TMSS-2107, TMSS-539, TMSS-1759, TMSS-2042, TMSS-2101, TMSS-2191, TMSS-2190, TMSS-2103, TMSS-723