Closes: TMSS-1501, TMSS-1504, TMSS-1505, TMSS-1506, TMSS-1392, TMSS-1380
Also delete branches TMSS-1504 and TMSS-1392