Resolve TMSS-551

Ramesh Kumarrequested to merge
TMSS-551 into master

Closes TMSS-551, TMSS-532, TMSS-548, TMSS-437.

Also delete branches TMSS-532, TMSS-548, TMSS-437.

Merge request reports