Closes TMSS-630, TMSS-213, TMSS-706, TMSS-641, TMSS-674. Delete branches TMSS-213, TMSS-706, TMSS-641, TMSS-674.