Closes TMSS-1885, TMSS-1886, TMSS-1888.
Please delete branch TMSS-1888 also as it is already merged to this branch.