Resolve TMSS-422

Ramesh Kumarrequested to merge
TMSS-422 into master

Closes TMSS-422 & TMSS-387.

Please delete both TMSS-422 and TMSS-387 branches.

Merge request reports