Closes TMSS-1618, TMSS-1503, TMSS-1565, TMSS-1529, TMSS-1558
Also please delete TMSS-1618, TMSS-1565, TMSS-1529, TMSS-1558