Closes TMSS-348, TMSS-226, TMSS-235, TMSS-319, TMSS-347.
All these branches are merged to TMSS-348. So they can be deleted.