Resolve TMSS-485

Ramesh Kumarrequested to merge
TMSS-485 into master

Closes TMSS-485 & TMSS-406.

Delete branch TMSS-406 also.

Merge request reports